File jtools-void-main.patch of Package jtools
Index: jtools/jchar.c
===================================================================
--- jtools.orig/jchar.c
+++ jtools/jchar.c
@@ -101,7 +101,7 @@ int getoutcode(int data,char ki[],char k
int ccommand(char ***p);
#endif
-void main(int argc,char **argv)
+int main(int argc,char **argv)
{
FILE *out;
int y,max,suppress = FALSE;
@@ -152,8 +152,7 @@ void main(int argc,char **argv)
default :
fprintf(stderr,"Illegal option \"-%c\"! Try using the \"-h\" option for help.\n",*argv[0]);
fprintf(stderr,"Usage: %s [-options] [outfile]\nExiting...\n",toolname);
- exit(1);
- break;
+ return 1;
}
if (outcode == NOTSET) {
strcpy(ki,DEFAULT_KI);
@@ -170,7 +169,7 @@ void main(int argc,char **argv)
strcpy(outfilename,*argv);
if ((out = fopen(outfilename,"w")) == NULL) {
fprintf(stderr,"Cannot open %s! Exiting...\n",outfilename);
- exit(1);
+ return 1;
}
}
if (makeascii)
@@ -198,7 +197,7 @@ void main(int argc,char **argv)
break;
}
}
- exit(0);
+ return 0;
}
int toup(int data)
Index: jtools/jconv.c
===================================================================
--- jtools.orig/jconv.c
+++ jtools/jconv.c
@@ -182,7 +182,7 @@ int getcode(char extension[],int data,ch
int ccommand(char ***p);
#endif
-void main(int argc,char **argv)
+int main(int argc,char **argv)
{
FILE *in,*out;
#ifndef THINK_C
@@ -248,20 +248,18 @@ void main(int argc,char **argv)
doeuctable();
break;
}
- exit(0);
- break;
+ return 0;
case 'V' :
verbose = TRUE;
break;
default :
fprintf(stderr,"Illegal option \"-%c\"! Try using the \"-h\" option for help.\n",*argv[0]);
fprintf(stderr,"Usage: %s [-options] [infile] [outfile]\nExiting...\n",toolname);
- exit(1);
- break;
+ return 1;
}
if (repairjis && delesc) {
fprintf(stderr,"Error! Both \"-r\" and \"-s\" options cannot be selected! Exiting...\n");
- exit(1);
+ return 1;
}
if (outcode == NOTSET && !repairjis && !delesc) {
strcpy(ki,DEFAULT_OKI);
@@ -276,7 +274,7 @@ void main(int argc,char **argv)
fprintf(stderr,"Cannot automatically detect input code from a pipe!\n");
fprintf(stderr,"Try \"-c\" to determine input code, then apply it to \"iCODE\" option.\n");
fprintf(stderr,"Exiting...\n");
- exit(1);
+ return 1;
}
#endif
in = stdin;
@@ -316,21 +314,21 @@ void main(int argc,char **argv)
}
if ((in = fopen(infilename,"r")) == NULL) {
fprintf(stderr,"Cannot open %s! Exiting...\n",infilename);
- exit(1);
+ return 1;
}
if (!docheck && makeoutfile)
if ((out = fopen(outfilename,"w")) == NULL) {
fprintf(stderr,"Cannot open %s! Exiting...\n",outfilename);
- exit(1);
+ return 1;
}
}
if (repairjis) {
jisrepair(in,out,verbose,outcode,ki,ko);
- exit(0);
+ return 0;
}
if (delesc) {
removeescape(in,out,verbose,forcedelesc);
- exit(0);
+ return 0;
}
tempincode = incode;
if (setincode && verbose) {
@@ -351,7 +349,7 @@ void main(int argc,char **argv)
fprintf(stderr,"Detected input code: ");
printcode(incode);
if (docheck)
- exit(0);
+ return 0;
}
rewind(in);
}
@@ -360,14 +358,12 @@ void main(int argc,char **argv)
switch (incode) {
case NOTSET :
fprintf(stderr,"Unknown input code! Exiting...\n");
- exit(1);
- break;
+ return 1;
case EUCORSJIS :
fprintf(stderr,"Ambiguous (Shift-JIS or EUC) input code!\n");
fprintf(stderr,"Try using the \"-iCODE\" option to specify either Shift-JIS or EUC.\n");
fprintf(stderr,"Exiting...\n");
- exit(1);
- break;
+ return 1;
case ASCII :
fprintf(stderr,"Since detected input code is ASCII, it may be damaged New- or Old-JIS\n");
fprintf(stderr,"Trying to repair...\n");
@@ -421,7 +417,7 @@ void main(int argc,char **argv)
}
break;
}
- exit(0);
+ return 0;
}
int toup(int data)
Index: jtools/jcode.c
===================================================================
--- jtools.orig/jcode.c
+++ jtools/jcode.c
@@ -184,7 +184,7 @@ int dopadding(int data);
int ccommand(char ***p);
#endif
-void main(int argc,char **argv)
+int main(int argc,char **argv)
{
FILE *in,*out;
#ifndef THINK_C
@@ -205,7 +205,7 @@ void main(int argc,char **argv)
readcodes = TRUE;
if (*++argv[0] != '\0') {
TreatOneCode(argv[0]);
- exit(1);
+ return 1;
}
break;
case 'H' :
@@ -235,8 +235,7 @@ void main(int argc,char **argv)
default :
fprintf(stderr,"Illegal option \"-%c\"! Try using the \"-h\" option for help.\n",*argv[0]);
fprintf(stderr,"Usage: %s [-options] [infile] [outfile]\nExiting...\n",toolname);
- exit(1);
- break;
+ return 1;
}
if (argc == 0) {
#ifndef THINK_C
@@ -244,7 +243,7 @@ void main(int argc,char **argv)
if (rc == -1 && errno == ESPIPE && !setincode) {
fprintf(stderr,"Cannot automatically detect input code from a pipe!\n");
fprintf(stderr,"Try using the \"iCODE\" option.\nExiting...\n");
- exit(1);
+ return 1;
}
#endif
in = stdin;
@@ -285,12 +284,12 @@ void main(int argc,char **argv)
}
if ((in = fopen(infilename,"r")) == NULL) {
fprintf(stderr,"Cannot open %s! Exiting...\n",infilename);
- exit(1);
+ return 1;
}
if (makeoutfile)
if ((out = fopen(outfilename,"w")) == NULL) {
fprintf(stderr,"Cannot open %s! Exiting...\n",outfilename);
- exit(1);
+ return 1;
}
}
if (readcodes && control)
@@ -340,14 +339,12 @@ void main(int argc,char **argv)
switch (incode) {
case NOTSET :
fprintf(stderr,"Unknown input code! Exiting...\n");
- exit(1);
- break;
+ return 1;
case EUCORSJIS :
fprintf(stderr,"Ambiguous (Shift-JIS or EUC) input code!\n");
fprintf(stderr,"Try using the \"-iCODE\" option to specify either Shift-JIS or EUC.\n");
fprintf(stderr,"Exiting...\n");
- exit(1);
- break;
+ return 1;
case NEW :
case OLD :
case NEC :
@@ -363,7 +360,7 @@ void main(int argc,char **argv)
TreatASCII(in,out,notation,control,pad);
break;
}
- exit(0);
+ return 0;
}
int toup(int data)
Index: jtools/jgrep.c
===================================================================
--- jtools.orig/jgrep.c
+++ jtools/jgrep.c
@@ -138,7 +138,7 @@ int my_getline(FILE *in,char *line,int m
int stringsearch(char *pattern,char *string);
int nextchar(char *string,int index);
-main(int argc,char **argv)
+int main(int argc,char **argv)
{
FILE *in,*out;
char infilename[100],outfilename[100],extension[5];
@@ -159,13 +159,13 @@ main(int argc,char **argv)
break;
default :
fprintf(stderr,"jgrep: illegal option %c\n",c);
- exit(1);
+ return 1;
}
}
}
if (argc == 0) {
fprintf(stderr,"Usage: jgrep [-x] [-n] pattern [infile] [outfile]\n");
- exit(1);
+ return 1;
}
else {
strcpy(pattern,*argv++);
@@ -202,11 +202,11 @@ main(int argc,char **argv)
}
if ((in = fopen(infilename,"r")) == NULL) {
fprintf(stderr,"\nCannot open %s\n",infilename);
- exit(1);
+ return 1;
}
if ((out = fopen(outfilename,"w")) == NULL) {
fprintf(stderr,"\nCannot open %s\n",outfilename);
- exit(1);
+ return 1;
}
}
while (my_getline(in,line,MAXLINLEN) > 0) {
@@ -223,7 +223,7 @@ main(int argc,char **argv)
fprintf(stderr,"\nLines not matching pattern [%s]: %d\n",pattern,found);
else
fprintf(stderr,"\nLines matching pattern [%s]: %d\n",pattern,found);
- exit(0);
+ return 0;
}
