Changeset 36084 for trunk/Ohana/src/opihi/lib.shell/ListOps.c

Timestamp:

Aug 31, 2013, 5:31:39 AM (13 years ago)

Author:

eugene

Message:

merge changes from EAM branch (medianfilter list error; handle empty kapa message; add join and vlist cmds, match2d help, excel-style lists: foo:A equiv to foo:0, time-based dvo temp-file purging, fix avmatch parallel coordlist bug, sub-pixel resolve sersic model, dgaussjordan needs larger dynamic range, avextract psfqf, psfqfperf, stargal)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/lib.shell/ListOps.c (modified) (1 diff)

trunk/Ohana/src/opihi/lib.shell/ListOps.c

@@ -189 +189 @@
 int is_list_data (char *line) {
 
-  char *comm, *temp;
-
-  temp = thisword (nextword (nextword (line)));
-  comm = thisword (line);
-
+  char *comm = NULL;
+  char *temp = NULL;
+  char *ptr  = NULL;
+
+  comm = thisword (line);
   if (comm == NULL) goto escape;
-
   if (strcmp (comm, "list")) goto escape;
+
+  ptr = nextword (line);
+  if (!strncmp("-excel", ptr, strlen("-excel"))) ptr = nextword (ptr);
+  if (!strncmp("-excel-style", ptr, strlen("-excel-style"))) ptr = nextword (ptr);
+  ptr = nextword (ptr);
+  if (!strncmp("-excel", ptr, strlen("-excel"))) ptr = nextword (ptr);
+  if (!strncmp("-excel-style", ptr, strlen("-excel-style"))) ptr = nextword (ptr);
+  temp = thisword (ptr);
 
   /* if (cond) (command) does not define a complete block */