Changeset 42081

Timestamp:

Feb 28, 2022, 12:15:17 PM (4 years ago)

Author:

eugene

Message:

add getargs function; add option to list -join to start on later word

Location:

trunk/Ohana/src/opihi/cmd.basic

Files:

• Makefile (modified) (1 diff)
• getargs.c (copied) (copied from branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.basic/getargs.c )
• init.c (modified) (2 diffs)
• list.c (modified) (2 diffs)
• test/getargs.ch (copied) (copied from branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.basic/test/getargs.ch )

trunk/Ohana/src/opihi/cmd.basic/Makefile

@@ -28 +28 @@
 $(SRC)/file.$(ARCH).o        \
 $(SRC)/getchr.$(ARCH).o     \
+$(SRC)/getargs.$(ARCH).o     \
 $(SRC)/help.$(ARCH).o        \
 $(SRC)/input.$(ARCH).o       \

trunk/Ohana/src/opihi/cmd.basic/init.c

@@ -14 +14 @@
 int file            PROTO((int, char **));
 int getchr_func     PROTO((int, char **));
+int getargs         PROTO((int, char **));
 int help            PROTO((int, char **));
 int input           PROTO((int, char **));
@@ -66 +67 @@
   {1, "file",          file,               "test file existence"},
   {1, "getchr",        getchr_func,        "find character in string"},
+  {1, "getargs",       getargs,            "find and remove arguments from the macro argument list"},
   {1, "help",          help,               "get help on a function *"},
   {1, "input",         input,              "read command lines from a file *"},

trunk/Ohana/src/opihi/cmd.basic/list.c

@@ -119 +119 @@
   // return an error if -add is given with no other args
   if ((argc > 2) && (!strcmp (argv[2], "-join"))) {
+    int start = 0;
+    if ((N = get_argument (argc, argv, "-start"))) {
+      remove_argument (N, &argc, argv);
+      start = atoi (argv[N]);
+      remove_argument (N, &argc, argv);
+    }
+
     if (argc != 4) {
       gprint (GP_ERR, "USAGE: list (root) -join (variable)\n");
@@ -137 +144 @@
     memset (output, 0, MAX_LINE_LENGTH);
 
-    for (i = 0; i < nList; i++) {
+    for (i = start; i < nList; i++) {
       snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
       char *word = get_variable (line);