Changeset c529ac8

Timestamp:

Aug 15, 2009, 7:08:17 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

65b2173

Parents:

712caac

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 03:11:28)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/15/09 19:08:17)

Message:

Add new function strs, to (later) cast char *const * to const char *const *.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• cmd.c (modified) (1 diff)
• filter.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• zwrite.c (modified) (1 diff)

cmd.c

@@ -95 +95 @@
   if (argc < 1) return(NULL);
 
-  retval = _owl_cmddict_execute(cd, ctx, argv, argc, cmdbuff);
+  retval = _owl_cmddict_execute(cd, ctx, strs(argv), argc, cmdbuff);
 
   owl_parsefree(argv, argc);

filter.c

@@ -8 +8 @@
 
   argv=owl_parseline(string, &argc);
-  out=owl_filter_init(f, name, argc, argv);
+  out=owl_filter_init(f, name, argc, strs(argv));
   owl_parsefree(argv, argc);
   return(out);

owl.c

@@ -58 +58 @@
 
   argcsave=argc;
-  argvsave=argv;
+  argvsave=strs(argv);
   configfile=NULL;
   confdir = NULL;

owl.h

@@ -201 +201 @@
 }
 #endif
+
+/* Convert char ** into char **.  This conversion is safe,
+ * and implicit in C++ (conv.qual 4) but for some reason not in C. */
+static inline char **strs(char **pstr)
+{
+  return (char **)pstr;
+}
 
 typedef struct _owl_variable {

zwrite.c

@@ -25 +25 @@
 
   /* parse the command line for options */
-  argv=myargv=owl_parseline(line, &argc);
+  argv=owl_parseline(line, &argc);
+  myargv=strs(argv);
   if (argc<0) {
     owl_function_error("Unbalanced quotes in zwrite");