===================================================================
RCS file: /home/cvs/OpenXM/src/util/oxreplace.c,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -p -r1.6 -r1.9
--- OpenXM/src/util/oxreplace.c	2009/02/15 01:31:51	1.6
+++ OpenXM/src/util/oxreplace.c	2013/11/06 00:03:58	1.9
@@ -1,10 +1,13 @@
-/* $OpenXM: OpenXM/src/util/oxreplace.c,v 1.5 2005/07/03 08:27:38 ohara Exp $ */
+/* $OpenXM: OpenXM/src/util/oxreplace.c,v 1.8 2013/08/31 13:44:08 ohara 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();
+int replaceOneWord(char *fname,char *old, char *new);
 
 char *readAsString(FILE *fp) {
   static char *s = NULL;
@@ -12,6 +15,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) {
@@ -35,7 +39,7 @@ char *readAsString(FILE *fp) {
   return s;
 }
 
-matches(char *word,char *s,int j) {
+int matches(char *word,char *s,int j) {
   int i;
   for (i=0; i<j; i++) {
     if (word[i] != s[i]) return 0;
@@ -43,7 +47,7 @@ matches(char *word,char *s,int j) {
   return 1;
 }
 
-isHexc(int c) {
+int isHexc(int c) {
   if ((c >= '0') && (c<='9')) return 1;
   if ((c >= 'A') && (c<='F')) return 1;
   if ((c >= 'a') && (c<='f')) return 1;
@@ -75,10 +79,11 @@ char *hex2str(char hstr[]) {
   else return s;
 }
 
-main(int argc, char *argv[]) {
+int 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) {
@@ -94,22 +99,30 @@ 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);
 	  }
 	}
   }
-  exit(0);
+  return 0;
 }
 	
 #define DEBUG 1
 
-replaceOneWord(char *fname,char *old, char *new) {
+int replaceOneWord(char *fname,char *old, char *new) {
   FILE *fp;
   FILE *fpOrig;
   char *s;
@@ -133,8 +146,7 @@ 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");
@@ -173,10 +185,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");
 }
-