Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
Makefile.am options.c
Log Message:
Tue Oct 26 12:05:51 2004 Michael Jennings (mej)
Upon return from spifopt_parse()'s postparsing run, argv[] will now
contain only the non-option arguments left on the command line.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 24 Jan 2004 19:54:30 -0000 1.13
+++ Makefile.am 26 Oct 2004 16:06:50 -0000 1.14
@@ -9,4 +9,4 @@
linked_list.c mem.c msgs.c obj.c objpair.c options.c regexp.c \
socket.c str.c strings.c snprintf.c tok.c url.c
-libast_la_LDFLAGS = -version-info 2:0:0
+libast_la_LDFLAGS = -version-info 2:1:0
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/options.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- options.c 21 Oct 2004 20:03:17 -0000 1.16
+++ options.c 26 Oct 2004 16:06:50 -0000 1.17
@@ -29,11 +29,11 @@
* option parser.
*
* @author Michael Jennings <[EMAIL PROTECTED]>
- * $Revision: 1.16 $
- * $Date: 2004/10/21 20:03:17 $
+ * $Revision: 1.17 $
+ * $Date: 2004/10/26 16:06:50 $
*/
-static const char __attribute__((unused)) cvs_ident[] = "$Id: options.c,v 1.16
2004/10/21 20:03:17 rbdpngn Exp $";
+static const char __attribute__((unused)) cvs_ident[] = "$Id: options.c,v 1.17
2004/10/26 16:06:50 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -75,7 +75,7 @@
* @see @link DOXGRP_OPT Command Line Option Parser @endlink
* @ingroup DOXGRP_OPT
*/
-spifopt_settings_t spifopt_settings = { 0 };
+spifopt_settings_t spifopt_settings = { NULL, 0, 0, 0, 0, 0, NULL };
/**
* Option-type-to-string translator.
@@ -498,6 +498,7 @@
for (k = 0; k < len; k++) {
tmp[k] = SPIF_CAST(charptr) STRDUP(argv[k + i]);
D_OPTIONS(("tmp[%d] == %s\n", k, tmp[k]));
+ argv[k + i] = NULL;
}
tmp[k] = SPIF_NULL_TYPE(charptr);
*(SPIF_CAST_C(spif_charptr_t **) SPIFOPT_OPT_VALUE(n)) = tmp;
@@ -533,7 +534,10 @@
D_OPTIONS(("argv[%d] == \"%s\", opt == \"%s\"\n", i, argv[i], opt));
- if (opt == SPIF_CHARPTR(argv[i])) {
+ if (SPIF_PTR_ISNULL(opt)) {
+ /* NEXT_ARG(); */
+ break;
+ } else if (opt == SPIF_CHARPTR(argv[i])) {
/* If it's not an option, skip it. */
if (*opt != '-') {
NEXT_ARG();
@@ -556,10 +560,13 @@
NEXT_LETTER();
}
}
+ if (SPIFOPT_FLAGS_IS_SET(SPIFOPT_SETTING_POSTPARSE)) {
+ argv[i] = NULL;
+ }
/* If a value was passed to this option, set val_ptr to point to it. */
if (islong) {
- val_ptr = find_value_long(SPIF_CHARPTR(argv[i]), SPIF_CHARPTR(argv[i +
1]), &hasequal);
+ val_ptr = find_value_long(SPIF_CHARPTR(opt), SPIF_CHARPTR(argv[i + 1]),
&hasequal);
} else {
val_ptr = find_value_short(opt, SPIF_CHARPTR(argv[i + 1]));
}
@@ -656,9 +663,25 @@
((spifopt_abstract_handler_t) SPIFOPT_OPT_VALUE(j))(val_ptr);
}
}
+ if (SPIFOPT_FLAGS_IS_SET(SPIFOPT_SETTING_POSTPARSE)) {
+ argv[i] = NULL;
+ }
NEXT_LOOP();
}
- SPIFOPT_FLAGS_SET(SPIFOPT_SETTING_POSTPARSE);
+
+ if (SPIFOPT_FLAGS_IS_SET(SPIFOPT_SETTING_POSTPARSE)) {
+ for (i = 1, j = 1; i < argc; i++) {
+ if (argv[i]) {
+ argv[j] = argv[i];
+ j++;
+ }
+ }
+ if (j > 1) {
+ argv[j] = NULL;
+ }
+ } else {
+ SPIFOPT_FLAGS_SET(SPIFOPT_SETTING_POSTPARSE);
+ }
}
/**
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs