Index: ossp-pkg/str/Makefile.in
RCS File: /v/ossp/cvs/ossp-pkg/str/Makefile.in,v
rcsdiff -q -kk '-r1.40' '-r1.41' -u '/v/ossp/cvs/ossp-pkg/str/Makefile.in,v' 2>/dev/null
--- Makefile.in	2002/01/02 17:09:13	1.40
+++ Makefile.in	2002/01/31 13:34:13	1.41
@@ -189,7 +189,7 @@
 $(OBJS): Makefile
 
 #   AUTOMATICALLY GENERATED DEPENDENCY LIST - DO NOT EDIT
-str_pcre.o: str_pcre.c str_pcre.h str_pcre_tab.c
+str_pcre.o: str_pcre.c str_pcre.h str_pcre.tab
 str_memory.o: str_memory.c str_p.h str.h str_config.h str_pcre.h
 str_basic.o: str_basic.c str_p.h str.h str_config.h str_pcre.h
 str_search.o: str_search.c str_p.h str.h str_config.h str_pcre.h
Index: ossp-pkg/str/str_basic.c
RCS File: /v/ossp/cvs/ossp-pkg/str/str_basic.c,v
rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/str/str_basic.c,v' 2>/dev/null
--- str_basic.c	2002/01/02 17:09:13	1.9
+++ str_basic.c	2002/01/31 13:34:13	1.10
@@ -144,12 +144,12 @@
 
     /* concatenate the strings */
     ds = rv;
-    while ((*ds++ = *s++) != NUL)
-        /*nop*/;
-    while ((cp = va_arg(ap, char *)) != NULL)
-        while ((*ds++ = *cp++) != NUL)
-            /*nop*/;
-    *ds = NUL;
+    while ((*ds = *s++) != NUL)
+        ds++;
+    while ((cp = va_arg(ap, char *)) != NULL) {
+        while ((*ds = *cp++) != NUL)
+            ds++;
+    }
 
     /* return target string */
     return rv;