[naviserver-commits] naviserver/nsd tclobjv.c,1.1,1.2

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29567/nsd

Modified Files:
	tclobjv.c 
Log Message:
Short circuit option processing when "--" is found.
Accurately describe optional arguments as optional in error messages.


Index: tclobjv.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclobjv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tclobjv.c	26 Feb 2005 17:15:52 -0000	1.1
--- tclobjv.c	28 Feb 2005 07:15:06 -0000	1.2
***************
*** 83,86 ****
--- 83,89 ----
              remain = specPtr->proc(specPtr->dest, interp, objc, objv + objvIndex,
                                     specPtr->arg);
+             if (remain == objc) {
+                 break;
+             }
              if (remain < 0 || remain > objc) {
                  return NS_ERROR;
***************
*** 455,459 ****
      }
      for (specPtr = argSpec; specPtr->key != NULL; ++specPtr) {
!         Ns_DStringVarAppend(&ds, specPtr->key, " ", NULL);
      }
      Tcl_WrongNumArgs(interp, objc, objv, ds.string);
--- 458,463 ----
      }
      for (specPtr = argSpec; specPtr->key != NULL; ++specPtr) {
!         Ns_DStringPrintf(&ds, "%s%s ", specPtr->key,
!                          (*specPtr->key == '?') ? "?" : "");
      }
      Tcl_WrongNumArgs(interp, objc, objv, ds.string);