Add code to copy command line, so appending servers doesn't stomp on

the environment space.

svn path=/trunk/; revision=104

diff --git a/fetchmail.c b/fetchmail.c
index 95e410131e1e13d32137fc67ac22849469ec1bc8..3b9dfc1cda4c774b902a1178e9b6bd297365896a 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -90,17 +90,22 @@ main (argc,argv)
 int argc;
 char **argv;
 { 
-    int mboxfd, st;
+    int mboxfd, st, sargc;
     struct hostrec cmd_opts, def_opts;
     int parsestatus;
-    char *servername, *user, *tmpdir, tmpbuf[256]; 
+    char *servername, *user, *tmpdir, tmpbuf[256], *sargv[64]; 
     FILE       *tmpfp;
     pid_t pid;
 
     if (setdefaults(&def_opts) != 0)
        exit(PS_UNDEFINED);
 
-    if ((parsestatus = parsecmdline(argc,argv,&cmd_opts)) < 0)
+    if (argc > sizeof(sargv))
+       exit(PS_SYNTAX);
+    for (sargc = 0; sargc < argc; sargc++)
+       sargv[sargc] = argv[sargc];
+
+    if ((parsestatus = parsecmdline(sargc,sargv,&cmd_opts)) < 0)
        exit(PS_SYNTAX);
 
     if (versioninfo)
@@ -110,10 +115,10 @@ char **argv;
        exit(PS_SYNTAX);
 
     if (optind >= argc)
-       append_server_names(&argc, argv);
+       append_server_names(&sargc, sargv, sizeof(sargv));
 
     /* build in-core data list on all hosts */
-    while ((servername = getnextserver(argc, argv, &parsestatus)) != (char *)0)
+    while ((servername = getnextserver(sargc, sargv, &parsestatus)) != (char *)0)
     {
        if (strcmp(servername, "defaults") == 0)
            continue;
@@ -151,7 +156,8 @@ char **argv;
                printf("  Lockfile at %s\n", tmpbuf);
        }
        if (hostlist == NULL)
-           (void) printf("No mailservers set up -- perhaps %s is missing?\n",
+           (void) fprintf(stderr,
+               "No mailservers set up -- perhaps %s is missing?\n",
                          poprcfile);
        exit(0);
     }
@@ -386,7 +392,7 @@ struct hostrec *queryctl;
     char *cp;
 
     printf("  Username = '%s'\n", queryctl->remotename);
-    if (queryctl->password)
+    if (queryctl->password && outlevel == O_VERBOSE)
        printf("  Password = '%s'\n", queryctl->password);
     if (queryctl->rpopid)
        printf("  RPOP id = '%s'\n", queryctl->rpopid);

diff --git a/fetchmail.h b/fetchmail.h
index 43d348687fdfd3511bbee8bfb4e24f92c0c9c02e..7bfb1921cd0e8ba46f41c97bae5a29e211dc9722 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -131,7 +131,7 @@ int closeuserfolder (int);
 int openmailpipe (struct hostrec *);
 int closemailpipe (int);
 char *MD5Digest (char *);
-void append_server_names(int *, char **);
+void append_server_names(int *, char **, int);
 int daemonize(const char *, void (*)(int));
 
 #else

diff --git a/options.c b/options.c
index 188464b00ed6a1fa4ddc08dc18777934405631eb..8329b8831169483eee00ac67ba409b8cec88b145 100644 (file)
--- a/options.c
+++ b/options.c
@@ -220,6 +220,7 @@ struct hostrec *queryctl;
         break;
       case 'm':
       case LA_MDA:
+       queryctl->output = TO_MDA;
         strncpy(queryctl->mda,optarg,sizeof(queryctl->mda)-1);
         break;
       case 'P':