From a96a3f7333c8bc2d1a881b3bbbe629a322da266e Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 22 Feb 2000 15:57:17 +0000
Subject: [PATCH] Added output file name as an optional command line param.

---
 src/bpt/makeBpt.c              |  9 +++++++--
 src/dbStatic/dbToMenuH.c       | 11 ++++++++---
 src/dbStatic/dbToRecordtypeH.c | 12 ++++++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/bpt/makeBpt.c b/src/bpt/makeBpt.c
index f9af41543..53b30a50f 100644
--- a/src/bpt/makeBpt.c
+++ b/src/bpt/makeBpt.c
@@ -108,10 +108,11 @@ int main(argc, argv)
     char	*plastSlash;
     
 
-    if(argc!=2) {
-	fprintf(stderr,"usage: makeBpt file.data\n");
+    if(argc<2) {
+	fprintf(stderr,"usage: makeBpt file.data [outfile]\n");
 	exit(-1);
     }
+    if (argc==2) {
     plastSlash = strrchr(argv[1],'/');
     plastSlash = (plastSlash ? plastSlash+1 : argv[1]);
     outFilename = calloc(1,strlen(plastSlash)+2);
@@ -122,6 +123,10 @@ int main(argc, argv)
 	exit(-1);
     }
     strcpy(pext,".dbd");
+    } else {
+    outFilename = calloc(1,strlen(argv[2])+1);
+    strcpy(outFilename,argv[2]);
+    }
     inFile = fopen(argv[1],"r");
     if(!inFile) {
 	fprintf(stderr,"Error opening %s\n",argv[1]);
diff --git a/src/dbStatic/dbToMenuH.c b/src/dbStatic/dbToMenuH.c
index 9b29a75ce..8acac08de 100644
--- a/src/dbStatic/dbToMenuH.c
+++ b/src/dbStatic/dbToMenuH.c
@@ -53,7 +53,7 @@ int main(int argc,char **argv)
 
     /*Look for options*/
     if(argc<2) {
-	fprintf(stderr,"usage: dbToMenu -Idir -Idir file.dbd\n");
+	fprintf(stderr,"usage: dbToMenu -Idir -Idir file.dbd [outfile]\n");
 	exit(0);
     }
     while((strncmp(argv[1],"-I",2)==0)||(strncmp(argv[1],"-S",2)==0)) {
@@ -76,10 +76,11 @@ int main(int argc,char **argv)
 	argc -= strip;
 	for(i=1; i<argc; i++) argv[i] = argv[i + strip];
     }
-    if(argc!=2 || (strncmp(argv[1],"-",1)==0)) {
-	fprintf(stderr,"usage: dbToMenu -Idir -Idir file.dbd\n");
+    if(argc<2 || (strncmp(argv[1],"-",1)==0)) {
+	fprintf(stderr,"usage: dbToMenu -Idir -Idir file.dbd [outfile]\n");
 	exit(0);
     }
+	if (argc==2) {
     /*remove path so that outFile is created where program is executed*/
     plastSlash = strrchr(argv[1],'/');
     if(!plastSlash)  plastSlash = strrchr(argv[1],'\\');
@@ -92,6 +93,10 @@ int main(int argc,char **argv)
 	exit(-1);
     }
     strcpy(pext,".h");
+	} else {
+    outFilename = dbCalloc(1,strlen(argv[2])+1);
+    strcpy(outFilename,argv[2]);
+    }
     outFile = fopen(outFilename,"w");
     if(!outFile) {
 	errPrintf(0,__FILE__,__LINE__,"Error opening %s\n",outFilename);
diff --git a/src/dbStatic/dbToRecordtypeH.c b/src/dbStatic/dbToRecordtypeH.c
index 0234992f7..fa49d2539 100644
--- a/src/dbStatic/dbToRecordtypeH.c
+++ b/src/dbStatic/dbToRecordtypeH.c
@@ -57,7 +57,7 @@ int main(int argc,char **argv)
 
     /*Look for options*/
     if(argc<2) {
-	fprintf(stderr,"usage: dbToRecordtypeH -Idir -Idir file.dbd\n");
+	fprintf(stderr,"usage: dbToRecordtypeH -Idir -Idir file.dbd [outfile]\n");
 	exit(0);
     }
     while((strncmp(argv[1],"-I",2)==0)||(strncmp(argv[1],"-S",2)==0)) {
@@ -81,9 +81,10 @@ int main(int argc,char **argv)
 	for(i=1; i<argc; i++) argv[i] = argv[i + strip];
     }
     if(argc<2 || (strncmp(argv[1],"-",1)==0)) {
-	fprintf(stderr,"usage: dbToRecordtypeH -Idir -Idir file.dbd\n");
+	fprintf(stderr,"usage: dbToRecordtypeH -Idir -Idir file.dbd [outfile]\n");
 	exit(0);
     }
+    if(argc==2){
     /*remove path so that outFile is created where program is executed*/
     plastSlash = strrchr(argv[1],'/');
     if(!plastSlash)  plastSlash = strrchr(argv[1],'\\');
@@ -100,6 +101,13 @@ int main(int argc,char **argv)
 	strcpy(outFilename,"dbCommon.h");
 	isdbCommonRecord = TRUE;
     }
+    }else {
+    outFilename = dbCalloc(1,strlen(argv[2])+1);
+    strcpy(outFilename,argv[2]);
+    if(strstr(outFilename,"dbCommon.h")!=0) {
+	isdbCommonRecord = TRUE;
+    }
+    }
     outFile = fopen(outFilename,"w");
     if(!outFile) {
 	errPrintf(0,__FILE__,__LINE__,"Error opening %s\n",outFilename);