/[mailutils]/mailutils/mail/mail.c
ViewVC logotype

Diff of /mailutils/mail/mail.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.75 by gray, Mon Aug 18 13:17:30 2003 UTC revision 1.76 by gray, Thu Aug 28 19:43:03 2003 UTC
# Line 136  parse_opt (int key, char *arg, struct ar Line 136  parse_opt (int key, char *arg, struct ar
136    
137        if (args->file)        if (args->file)
138          {          {
           util_error (_("Usage error: --file takes an optional argument, "  
                       "it must follow the option\n"  
                       "without any intervening whitespace."));  
           util_error (_("Run mail --help for more info."));  
139            args->file = arg;            args->file = arg;
140          }          }
141        else        else
# Line 171  static const char *mail_capa[] = { Line 167  static const char *mail_capa[] = {
167          "common",          "common",
168          "license",          "license",
169          "mailbox",          "mailbox",
170    #ifdef WITH_TLS
171            "tls",
172    #endif
173           NULL           NULL
174  };  };
175                                                            
# Line 222  main (int argc, char **argv) Line 221  main (int argc, char **argv)
221    /* Native Language Support */    /* Native Language Support */
222    mu_init_nls ();    mu_init_nls ();
223    
224    /* Register the desire formats.  */    /* Register the desired formats.  */
225    {    {
226      list_t bookie;      list_t bookie;
227      registrar_get_list (&bookie);      registrar_get_list (&bookie);
# Line 252  main (int argc, char **argv) Line 251  main (int argc, char **argv)
251    /* set up the default environment */    /* set up the default environment */
252    if (!getenv ("HOME"))    if (!getenv ("HOME"))
253      {      {
254        char *p = util_get_homedir();        char *p = util_get_homedir ();
255        setenv ("HOME", p, 0);        setenv ("HOME", p, 0);
256      }      }
257    setenv ("DEAD", util_fullpath("~/dead.letter"), 0);    setenv ("DEAD", util_fullpath("~/dead.letter"), 0);
# Line 326  main (int argc, char **argv) Line 325  main (int argc, char **argv)
325    /* argument parsing */    /* argument parsing */
326    
327    mu_argp_init (program_version, NULL);    mu_argp_init (program_version, NULL);
328    #ifdef WITH_TLS
329      mu_tls_init_client_argp ();
330    #endif
331    mu_argp_parse (&argp, &argc, &argv, 0, mail_capa, NULL, &args);    mu_argp_parse (&argp, &argc, &argv, 0, mail_capa, NULL, &args);
332    
333    /* read system-wide mail.rc and user's .mailrc */    /* read system-wide mail.rc and user's .mailrc */

Legend:
Removed from v.1.75  
changed lines
  Added in v.1.76

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26