===================================================================
RCS file: /home/cvs/OpenXM/src/asir-doc/extract_func.c,v
retrieving revision 1.1.1.1
retrieving revision 1.8
diff -u -p -r1.1.1.1 -r1.8
--- OpenXM/src/asir-doc/extract_func.c	1999/12/08 05:47:43	1.1.1.1
+++ OpenXM/src/asir-doc/extract_func.c	2020/09/05 00:57:16	1.8
@@ -1,8 +1,21 @@
-/* $OpenXM: OpenXM/src/asir99/doc/extract_func.c,v 1.1 1999/11/12 09:21:36 noro Exp $ */
+/* $OpenXM: OpenXM/src/asir-doc/extract_func.c,v 1.7 2016/08/29 04:56:58 noro Exp $ */
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
+#if defined(__MINGW32__)
+#include <io.h>
+#define mkdir(d,m)   ((mkdir)((d)))
+#endif
+
+void create_dir(char *);
+int fname(char *,char **);
+
+int
 main(argc,argv)
 int argc;
 char **argv;
@@ -14,15 +27,24 @@ char **argv;
 	char *name[BUFSIZ];
 	char cmd[BUFSIZ];
 	char fn[BUFSIZ];
+	char *file;
+	int jis;
 	int i,j;
 
-	if ( argc != 2 ) {
-		fprintf(stderr,"usage : extract_func infofile\n");
+	if ( (argc != 2) && (argc != 3) ) {
+		fprintf(stderr,"usage : extract_func [-j] infofile\n");
 		exit(0);
 	}
-	in = fopen(argv[1],"rb");
+	if ( argc == 3 ) {
+		jis = 1;	
+		file = argv[2];
+	} else {
+		jis = 0;
+		file = argv[1];
+	}
+	in = fopen(file,"rb");
 	if ( !in ) {
-		fprintf(stderr,"%s : not found",argv[1]);
+		fprintf(stderr,"%s : not found",file);
 		exit(0);
 	}
 	fp = 0;
@@ -40,6 +62,7 @@ char **argv;
 			if ( i >= 3 && buf1[i] == '\n' ) {
 				fputs(buf,stderr);
 				strcpy(fn,name[0]);
+				create_dir(fn);
 				fp = fopen(fn,"w");
 				for ( j = 1; name[j]; j++ )
 					symlink(fn,name[j]);
@@ -49,44 +72,70 @@ char **argv;
 				fputs(buf,fp);
 				if ( buf1[0] == 0x1f ) {
 					fclose(fp); fp = 0;
-					sprintf(cmd,"nkf %s > %s.tmp; rm -f %s; mv %s.tmp %s",
-						name[0],name[0],name[0]);
-					system(cmd);
+					if ( jis ) {
+						sprintf(cmd,"nkf -w %s > %s.tmp; rm -f %s; mv %s.tmp %s",
+							name[0],name[0],name[0],name[0]);
+						system(cmd);
+					}
 				} else
 					fputs(buf1,fp);
 			}
-		} else if ( fp )
+		} else if ( fp ) {
 			if ( buf[0] == 0x1f ) {
 				fclose(fp); fp = 0;
-				sprintf(cmd,"nkf %s > %s.tmp; rm -f %s; mv %s.tmp %s",
-					fn,fn,fn,fn,fn);
-				system(cmd);
-			} else
+				if ( jis ) {
+					sprintf(cmd,"nkf -w %s > %s.tmp; rm -f %s; mv %s.tmp %s",
+						fn,fn,fn,fn,fn);
+					system(cmd);
+				}
+			} else {
 				fputs(buf,fp);
+			}
+		}
 	}
 }
 
+void create_dir(char *fname)
+{
+	char *p;
+
+	p = fname;
+	while ( *p && (p = strchr(p,'/')) ) {
+		*p = 0;
+		mkdir(fname,0755);
+		*p = '/';
+		p++;
+	}
+	
+}
+
 int fname(buf,name)
 char *buf;
 char **name;
 {
 	int i,len;
-	char *quote,*bquote,*comma;
+	char *quote,*bquote,*comma,*space,*p;
 
-	/* XXX */
-	if ( *buf != '`' )
-		return 0;
-
+	if ( *buf != '`' ) {
+		/* skip X.X.X if exists */
+		space = strchr(buf,' ');
+		if ( !space ) return 0;
+		for ( p = buf; p < space; p++ )
+			if ( !isdigit(*p) && *p != '.' ) return 0;
+		buf = space+1;
+	}
 	i = 0;
 	while ( 1 ) {
-		/* search a back quote */
-		bquote = index(buf,'`' );
+    /* makeinfo v5 outputs 'fname', while makeinfo v4 output `fname' */
+		/* search a (back) quote */
+		bquote = strchr(buf,'`' );
 		if ( !bquote )
-			return 0;
+      bquote = strchr(buf,'\'');
+      if ( !bquote ) return 0;
 		buf = bquote+1;
 
 		/* buf points to a function; search a quote */
-		quote = index(buf,'\'');
+		quote = strchr(buf,'\'');
 		if ( !quote )
 			return 0;
 		len = quote-buf;
@@ -96,7 +145,7 @@ char **name;
 		i++;
 		buf = quote+1;
 		/* buf points to ',' or a space char; search a comma */
-		comma = index(buf,',');
+		comma = strchr(buf,',');
 		if ( !comma ) {
 			/* if the rest chars include a non-space char, then return 0 */
 			while ( *buf && isspace(*buf) ) buf++;