[Cvs-syncmail] syncmail syncmail,1.36.2.1,1.36.2.2

[Fred L. D. <fd...@us...>]

Update of /cvsroot/cvs-syncmail/syncmail
In directory sc8-pr-cvs1:/tmp/cvs-serv19465

Modified Files:
      Tag: new-config-branch
	syncmail 
Log Message:
load_cmdline():  Update the options passed to getopt(), and handle
                 --config and --no-config as described in the
                 strawman.


Index: syncmail
===================================================================
RCS file: /cvsroot/cvs-syncmail/syncmail/syncmail,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
diff -u -d -r1.36.2.1 -r1.36.2.2
--- syncmail	10 Jul 2003 05:40:10 -0000	1.36.2.1
+++ syncmail	10 Jul 2003 06:08:47 -0000	1.36.2.2
@@ -519,6 +519,7 @@
                                    'hC:cuS:R:qf:m:',
                                    ['fromhost=', 'context=', 'cvsroot=',
                                     'mailhost=', 'subject-prefix=',
+                                    'config=', 'no-config',
                                     'reply-to=', 'help', 'quiet'])
     except getopt.error, msg:
         usage(2, msg)
@@ -529,10 +530,10 @@
         elif opt == '--cvsroot':
             cmdline['cvsroot'] = arg
         elif opt == "--config":
-            if arg == '-' and cmdline.has_key('config-file'):
-                del cmdline['config-file']
-            else:
-                cmdline['config-file'] = arg
+            cmdline['config-file'] = arg
+        elif opt == '--no-config':
+            if cmdline.has_key('config-file'):
+                def cmdline['config-file']
         elif opt in ('-C', '--context'):
             cmdline['context-lines'] = arg
         elif opt == '-c':