===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxreplace.c,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- OpenXM/src/util/oxreplace.c	2005/04/14 07:11:58	1.4
+++ OpenXM/src/util/oxreplace.c	2009/02/15 01:31:51	1.6
@@ -1,6 +1,8 @@
-/* $OpenXM: OpenXM/src/util/oxreplace.c,v 1.3 2003/05/31 03:05:00 takayama Exp $ */
+/* $OpenXM: OpenXM/src/util/oxreplace.c,v 1.5 2005/07/03 08:27:38 ohara Exp $ */
 /* cf. fb/src/misc/nan-tfb2.c */
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 int ReplaceLine=0;
 
@@ -114,6 +116,7 @@ replaceOneWord(char *fname,char *old, char *new) {
   char *fnameBackup;
   char *comm;
   int i,j,mm;
+  int ns,nold;
 #ifdef DEBUG
   fprintf(stderr,"fname=%s, old=%s, new=%s, ReplaceLine=%d\n",fname,old,new,ReplaceLine);
 #endif
@@ -136,12 +139,13 @@ replaceOneWord(char *fname,char *old, char *new) {
   fpOrig = fopen(fnameBackup,"r");
   fp = fopen(fname,"w");
   s = readAsString(fpOrig);
+  ns = strlen(s); nold=strlen(old);
   if (ReplaceLine) {
-    for (i=0; i<strlen(s); i++) {
+    for (i=0; i<ns; i++) {
       /* Look for \n */
       mm = 0;
-	  for (j = i; j<strlen(s); j++) {
-        if (matches(old,s+j,strlen(old))) mm = 1;
+	  for (j = i; j<ns; j++) {
+        if (matches(old,s+j,nold)) mm = 1;
 		if (s[j] == '\n') { break;}
       }
       if (mm) {
@@ -155,8 +159,8 @@ replaceOneWord(char *fname,char *old, char *new) {
 	  }
 	}
   }else{
-    for (i=0; i<strlen(s); i++) {
-      if (!matches(old,s+i,strlen(old))) {
+    for (i=0; i<ns; i++) {
+      if (!matches(old,s+i,nold)) {
         fputc(s[i],fp);
       }else{
         fprintf(fp,"%s",new);