===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxreplace.c,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- OpenXM/src/util/oxreplace.c	2005/04/14 07:11:58	1.4
+++ OpenXM/src/util/oxreplace.c	2013/08/31 13:44:08	1.8
@@ -1,8 +1,12 @@
-/* $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.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;
@@ -10,6 +14,7 @@ char *readAsString(FILE *fp) {
   int p = 0;
   char *s2;
   int c;
+  if (fp == NULL) { s=NULL; return(NULL); }
   if (s == NULL) {
     s = (char *) malloc(size);
     if (s == NULL) {
@@ -77,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) {
@@ -92,11 +98,19 @@ main(int argc, char *argv[]) {
     } 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);
 	  }
@@ -114,6 +128,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
@@ -130,18 +145,18 @@ 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);
+  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 +170,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);
@@ -169,10 +184,8 @@ replaceOneWord(char *fname,char *old, char *new) {
   return 0;
 }
 
-
-usage() {
-  fprintf(stderr,"oxreplace [--old oword --new nword --f rule_file_name --replaceLine] \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 hexadecimal codes\n");
 }
-