diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-03-20 11:16:14 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-03-20 11:16:14 +0000 |
| commit | f46edac4bf1946ae4b2cb5ee6c07e8485d4f79e7 (patch) | |
| tree | 2ae5eb66dbe3d2b30e146f226dccf7771208ecec /source3/web | |
| parent | 873e090be37a3128f73d87988c2981dbfcee6601 (diff) | |
| download | samba-f46edac4bf1946ae4b2cb5ee6c07e8485d4f79e7.tar.gz samba-f46edac4bf1946ae4b2cb5ee6c07e8485d4f79e7.tar.bz2 samba-f46edac4bf1946ae4b2cb5ee6c07e8485d4f79e7.zip | |
Make swat use popt
(This used to be commit eccb6998111ce7a56bfd11578ccd7c09958f407e)
Diffstat (limited to 'source3/web')
| -rw-r--r-- | source3/web/swat.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/source3/web/swat.c b/source3/web/swat.c index d6693b4e75..bece4e71e2 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -1261,10 +1261,16 @@ static void printers_page(void) **/ int main(int argc, char *argv[]) { - extern char *optarg; - extern int optind; int opt; char *page; + poptContext pc; + struct poptOption long_options[] = { + POPT_AUTOHELP + { "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, TRUE, "Disable authentication (demo mode)" }, + { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, + { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile}, + { 0, 0, 0, 0 } + }; fault_setup(NULL); umask(S_IWGRP | S_IWOTH); @@ -1288,16 +1294,13 @@ static void printers_page(void) close(2); open("/dev/null", O_WRONLY); - while ((opt = getopt(argc, argv,"s:a")) != EOF) { - switch (opt) { - case 's': - pstrcpy(dyn_CONFIGFILE,optarg); - break; - case 'a': - demo_mode = True; - break; - } - } + pc = poptGetContext("swat", argc, (const char **) argv, long_options, 0); + + /* Parse command line options */ + + while((opt = poptGetNextOpt(pc)) != -1) { } + + poptFreeContext(pc); setup_logging(argv[0],False); load_config(True); |