* src/lharc.c: use xstrdup() instead of strdup().

* src/lha_macro.h: ditto.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@49 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/lha_macro.h b/src/lha_macro.h
index e00a8b1..27518de 100644 (file)
--- a/src/lha_macro.h
+++ b/src/lha_macro.h
@@ -66,6 +66,7 @@ extern char    *getenv();
 
 extern char    *xmalloc();
 extern char    *xrealloc();
 
 extern char    *xmalloc();
 extern char    *xrealloc();

+extern char    *xstrdup();

 
 /* external variables */
 extern int      errno;
 
 /* external variables */
 extern int      errno;

diff --git a/src/lharc.c b/src/lharc.c
index 65c2612..1693344 100644 (file)
--- a/src/lharc.c
+++ b/src/lharc.c
@@ -199,8 +199,7 @@ main(argc, argv)
        ac = argc;
        av = (char **)xmalloc( sizeof(char*)*argc );
        for (i=0; i<argc; i++) {
        ac = argc;
        av = (char **)xmalloc( sizeof(char*)*argc );
        for (i=0; i<argc; i++) {

-         if ((av[i] = strdup( argv[i] )) == NULL)
-               fatal_error("not enough memory\n");
+        av[i] = xstrdup( argv[i] );

        }
 
        if (ac < 2)
        }
 
        if (ac < 2)


@@ -414,8 +413,7 @@ work:
                        }
                        if (strlen(inpbuf) < 1)
                                continue;
                        }
                        if (strlen(inpbuf) < 1)
                                continue;

-                       if ((xfilev[cmd_filec++] = (char *) strdup(inpbuf)) == NULL)
-                               fatal_error("Virtual memory exhausted\n");
+                       xfilev[cmd_filec++] = xstrdup(inpbuf);

                }
                xfilev[cmd_filec] = NULL;
                cmd_filev = xfilev;
                }
                xfilev[cmd_filec] = NULL;
                cmd_filev = xfilev;


@@ -616,6 +614,18 @@ xrealloc(old, size)
        return p;
 }
 
        return p;
 }
 

+char *
+xstrdup(str)
+       char *str;
+{
+    int len = strlen(str);
+       char *p = (char *)xmalloc(str + 1);
+       if (!p)
+               fatal_error("Not enough memory");
+    strcpy(p, str);
+       return p;
+}
+

 /* ------------------------------------------------------------------------ */
 /*                                                             STRING POOL                                                                     */
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 /*                                                             STRING POOL                                                                     */
 /* ------------------------------------------------------------------------ */