X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fwalk.c;h=0823289ef8e4aad08010eac4d06d30a635e93eb6;hb=30ef33217aeee51ee47b2433e9384b011646254a;hp=f4f7fe802fc8fd35cef57c5395bfd74f01b8ad1a;hpb=be3c0a43e1e6b1244032726df02a3ab450a3c4be;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/walk.c b/x2p/walk.c
index f4f7fe8..0823289 100644
--- a/x2p/walk.c
+++ b/x2p/walk.c
@@ -34,7 +34,11 @@ static void tab ( STR *str, int lvl );
 
 int prewalk ( int numit, int level, int node, int *numericptr );
 STR * walk ( int useval, int level, int node, int *numericptr, int minprec );
-
+#ifdef NETWARE
+char *savestr(char *str);
+char *cpytill(register char *to, register char *from, register int delim);
+char *instr(char *big, char *little);
+#endif
 
 STR *
 walk(int useval, int level, register int node, int *numericptr, int minprec)
@@ -52,7 +56,7 @@ walk(int useval, int level, register int node, int *numericptr, int minprec)
     STR *tmp2str;
     STR *tmp3str;
     char *t;
-    char *d, *s = 0;
+    char *d, *s;
     int numarg;
     int numeric = FALSE;
     STR *fstr;
@@ -822,11 +826,8 @@ sub Pick {\n\
 	str_cat(str,")");
 	break;
     case OGSUB:
-    case OSUB:
-	if (type == OGSUB)
-	    s = "g";
-	else
-	    s = "";
+    case OSUB: {
+	int gsub = type == OGSUB ? 1 : 0;
 	str = str_new(0);
 	tmpstr = str_new(0);
 	i = 0;
@@ -856,6 +857,7 @@ sub Pick {\n\
 	    }
 	    *d = '\0';
 	    str_set(tmp2str,tokenbuf);
+	    s = gsub ? "/g" : "/";
 	}
 	else {
 	    tmp2str=walk(1,level,ops[node+2].ival,&numarg,P_MIN);
@@ -863,9 +865,10 @@ sub Pick {\n\
 	    str_scat(tmp3str,tmp2str);
 	    str_cat(tmp3str,").'\"') =~ s/&/\\$&/g, ");
 	    str_set(tmp2str,"eval $s_");
-	    s = (char*)(*s == 'g' ? "ge" : "e");
+	    s = gsub ? "/ge" : "/e";
 	    i++;
 	}
+	str_cat(tmp2str,s);
 	type = ops[ops[node+1].ival].ival;
 	len = type >> 8;
 	type &= 255;
@@ -877,8 +880,6 @@ sub Pick {\n\
 	    str_scat(str,tmpstr);
 	    str_scat(str,fstr);
 	    str_scat(str,tmp2str);
-	    str_cat(str,"/");
-	    str_cat(str,s);
 	}
 	else if ((type == OFLD && !split_to_array) || (type == OVAR && len == 1)) {
 	    if (useval && i)
@@ -889,8 +890,6 @@ sub Pick {\n\
 	    str_scat(str,fstr);
 	    str_cat(str,"/");
 	    str_scat(str,tmp2str);
-	    str_cat(str,"/");
-	    str_cat(str,s);
 	}
 	else {
 	    i++;
@@ -903,8 +902,6 @@ sub Pick {\n\
 	    str_scat(str,tmpstr);
 	    str_cat(str,"/$s/");
 	    str_scat(str,tmp2str);
-	    str_cat(str,"/");
-	    str_cat(str,s);
 	}
 	if (useval && i)
 	    str_cat(str,")");
@@ -913,7 +910,7 @@ sub Pick {\n\
 	str_free(tmp2str);
 	str_free(tmp3str);
 	numeric = 1;
-	break;
+	break; }
     case ONUM:
 	str = walk(1,level,ops[node+1].ival,&numarg,P_MIN);
 	numeric = 1;