diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nmbd/nmbd.c | 16 | ||||
| -rw-r--r-- | source3/smbd/server.c | 18 |
2 files changed, 22 insertions, 12 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 9eae3b0e98..9b872f8ffe 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -534,6 +534,8 @@ static void usage(char *pname) printf( "\t-n netbiosname. " ); printf( "the netbios name to advertise for this host\n"); printf( "\t-H hosts file load a netbios hosts file\n" ); + printf( "\t-a append to log file (default)\n" ); + printf( "\t-o overwrite log file, don't append\n" ); printf( "\n"); } /* usage */ @@ -546,6 +548,9 @@ int main(int argc,char *argv[]) int opt; extern FILE *dbf; extern char *optarg; + extern BOOL append_log; + + append_log = True; /* Default, override with '-o' option. */ global_nmb_port = NMB_PORT; *host_file = 0; @@ -595,7 +600,8 @@ int main(int argc,char *argv[]) #endif /* SIGUSR2 */ #endif /* MEM_MAN */ - while((opt = getopt(argc, argv, "as:T:I:C:bAi:B:N:Rn:l:d:Dp:hSH:G:f:")) != EOF) + while( EOF != + (opt = getopt( argc, argv, "aos:T:I:C:bAi:B:N:Rn:l:d:Dp:hSH:G:f:" )) ) { switch (opt) { @@ -624,10 +630,10 @@ int main(int argc,char *argv[]) strupper(scope); break; case 'a': - { - extern BOOL append_log; - append_log = !append_log; - } + append_log = True; + break; + case 'o': + append_log = False; break; case 'D': is_daemon = True; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 41a2a10d50..a08ff8184e 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -490,7 +490,8 @@ static void usage(char *pname) { DEBUG(0,("Incorrect program usage - are you sure the command line is correct?\n")); - printf("Usage: %s [-D] [-p port] [-d debuglevel] [-l log basename] [-s services file]\n",pname); + printf("Usage: %s [-D] [-p port] [-d debuglevel] ", pname); + printf("[-l log basename] [-s services file]\n" ); printf("Version %s\n",VERSION); printf("\t-D become a daemon\n"); printf("\t-p port listen on the specified port\n"); @@ -498,7 +499,8 @@ static void usage(char *pname) printf("\t-l log basename. Basename for log/debug files\n"); printf("\t-s services file. Filename of services file\n"); printf("\t-P passive only\n"); - printf("\t-a overwrite log file, don't append\n"); + printf("\t-a append to log file (default)\n"); + printf("\t-o overwrite log file, don't append\n"); printf("\n"); } @@ -564,7 +566,7 @@ static void usage(char *pname) argc--; } - while ((opt = getopt(argc, argv, "O:i:l:s:d:Dp:hPaf:")) != EOF) + while ( EOF != (opt = getopt(argc, argv, "O:i:l:s:d:Dp:h?Paof:")) ) switch (opt) { case 'O': pstrcpy(user_socket_options,optarg); @@ -590,10 +592,11 @@ static void usage(char *pname) break; case 'a': - { - extern BOOL append_log; - append_log = !append_log; - } + append_log = True; + break; + + case 'o': + append_log = False; break; case 'D': @@ -612,6 +615,7 @@ static void usage(char *pname) break; case 'h': + case '?': usage(argv[0]); exit(0); break; |