===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxreplace.c,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM/src/util/oxreplace.c	2003/05/31 03:05:00	1.3
+++ OpenXM/src/util/oxreplace.c	2013/08/31 13:44:08	1.8
@@ -1,13 +1,20 @@
-/* $OpenXM: OpenXM/src/util/oxreplace.c,v 1.2 2003/03/26 04:56:44 takayama Exp $ */
+/* $OpenXM: OpenXM/src/util/oxreplace.c,v 1.7 2011/05/02 06:39:51 takayama Exp $ */
 /* cf. fb/src/misc/nan-tfb2.c */
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
+int ReplaceLine=0;
+int Verbose=0;
+void usage();
+
 char *readAsString(FILE *fp) {
   static char *s = NULL;
   static int size= 102400;
   int p = 0;
   char *s2;
   int c;
+  if (fp == NULL) { s=NULL; return(NULL); }
   if (s == NULL) {
     s = (char *) malloc(size);
     if (s == NULL) {
@@ -75,6 +82,7 @@ main(int argc, char *argv[]) {
   int i;
   char *old = NULL;
   char *new = NULL;
+  FILE *fp;
   if (argc < 2) {usage(); exit(0); }
   for (i=1; i<argc; i++) {
 	if (strcmp(argv[i],"--old") == 0) {
@@ -85,14 +93,24 @@ main(int argc, char *argv[]) {
 	  old = hex2str(argv[i+1]); i++;
 	} else if (strcmp(argv[i],"--newx") == 0) {
 	  new = hex2str(argv[i+1]); i++;
-	} else if (strcmp(argv[i],"--f") == 0) {
+    } else if (strcmp(argv[i],"--replaceLine") == 0) {
+      ReplaceLine = 1;
+    } else if (strcmp(argv[i],"--f") == 0) {
 	  fprintf(stderr,"--f option (rule file) has not yet been implemented.\n");
 	  exit(10);
+	} else if (strcmp(argv[i],"--newfile")==0) {
+	  fp = fopen(argv[i+1],"r"); i++;
+	  if (fp == NULL) {
+		fprintf(stderr,"Error: File %s is not found\n",argv[i]); exit(10);
+	  }
+      new = readAsString(fp); fclose(fp); readAsString(NULL);
+	} else if (strcmp(argv[i],"--verbose")==0) {
+      Verbose = 1;
 	}else {
 	  if ((old != NULL) && (new != NULL)) {
 		replaceOneWord(argv[i],old,new);
 	  }else{
-		fprintf(stderr,"--old and --new option or --f option are not given.\n");
+		fprintf(stderr,"--old and --new option or --newfile or --f option are not given.\n");
 		usage();
 		exit(10);
 	  }
@@ -109,9 +127,10 @@ replaceOneWord(char *fname,char *old, char *new) {
   char *s;
   char *fnameBackup;
   char *comm;
-  int i;
+  int i,j,mm;
+  int ns,nold;
 #ifdef DEBUG
-  fprintf(stderr,"fname=%s, old=%s, new=%s\n",fname,old,new);
+  fprintf(stderr,"fname=%s, old=%s, new=%s, ReplaceLine=%d\n",fname,old,new,ReplaceLine);
 #endif
   fp = fopen(fname,"r");
   if (fp == NULL) {
@@ -126,29 +145,47 @@ replaceOneWord(char *fname,char *old, char *new) {
 	fprintf(stderr,"No more memory.\n"); exit(10);
   }
   sprintf(fnameBackup,"%s.%ld.oxreplace-tmp.old",fname,(long) time(NULL));
-  sprintf(comm,"cp %s %s",fname,fnameBackup);
-  system(comm);
+  rename(fname,fnameBackup);
 
   fpOrig = fopen(fnameBackup,"r");
   fp = fopen(fname,"w");
   s = readAsString(fpOrig);
-  for (i=0; i<strlen(s); i++) {
-    if (!matches(old,s+i,strlen(old))) {
-      fputc(s[i],fp);
-	}else{
-	  fprintf(fp,"%s",new);
-	  i += strlen(old)-1;
+  ns = strlen(s); nold=strlen(old);
+  if (ReplaceLine) {
+    for (i=0; i<ns; i++) {
+      /* Look for \n */
+      mm = 0;
+	  for (j = i; j<ns; j++) {
+        if (matches(old,s+j,nold)) mm = 1;
+		if (s[j] == '\n') { break;}
+      }
+      if (mm) {
+		i = j;
+		fprintf(fp,"%s\n",new);
+	  }else{
+		for ( ; i < j; i++) {
+		  putc(s[i],fp);
+		}
+		putc('\n',fp);
+	  }
 	}
+  }else{
+    for (i=0; i<ns; i++) {
+      if (!matches(old,s+i,nold)) {
+        fputc(s[i],fp);
+      }else{
+        fprintf(fp,"%s",new);
+        i += strlen(old)-1;
+      }
+    }
   }
   fclose(fp); fclose(fpOrig);
   free(comm); free(fnameBackup);
   return 0;
 }
 
-
-usage() {
-  fprintf(stderr,"oxreplace [--old oword --new nword --f rule_file_name] \n");
+void usage() {
+  fprintf(stderr,"oxreplace [--old oword [--new nword | --newfile filename] --f rule_file_name --replaceLine] \n");
   fprintf(stderr,"          [file1 file2 ... ] \n");
-  fprintf(stderr,"    Use --oldx or --newx to give a word in hexadeciam codes\n");
+  fprintf(stderr,"    Use --oldx or --newx to give a word in hexadecimal codes\n");
 }
-