diff options
| author | John David Anglin <dave@hiauly1.hia.nrc.ca> | 2001-05-03 21:40:47 +0000 |
|---|---|---|
| committer | John David Anglin <danglin@gcc.gnu.org> | 2001-05-03 21:40:47 +0000 |
| commit | 0ee6e0a9abb3e29343f2a453c3a1a438ef58a711 (patch) | |
| tree | 1c85b48a0648686d37557b5f352b747f5e06178e | |
| parent | c418c5ab57ac93a0b5fecb1687daa4dfe171442e (diff) | |
| download | gcc-0ee6e0a9abb3e29343f2a453c3a1a438ef58a711.zip gcc-0ee6e0a9abb3e29343f2a453c3a1a438ef58a711.tar.gz gcc-0ee6e0a9abb3e29343f2a453c3a1a438ef58a711.tar.bz2 | |
jartool.c (jt_strdup): New function.
* jartool.c (jt_strdup): New function.
(get_next_arg): Use jt_strdup instead of strdup.
From-SVN: r41815
| -rw-r--r-- | fastjar/ChangeLog | 5 | ||||
| -rw-r--r-- | fastjar/jartool.c | 23 |
2 files changed, 25 insertions, 3 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index d34f7d8..c8d4d2a 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,8 @@ +2001-05-03 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * jartool.c (jt_strdup): New function. + (get_next_arg): Use jt_strdup instead of strdup. + 2001-01-21 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. diff --git a/fastjar/jartool.c b/fastjar/jartool.c index d8bfb2a..b719331 100644 --- a/fastjar/jartool.c +++ b/fastjar/jartool.c @@ -1,6 +1,6 @@ /* jartool.c - main functions for fastjar utility - Copyright (C) 1999, 2000 Bryan Burns + Copyright (C) 1999, 2000, 2001 Bryan Burns This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -17,9 +17,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: jartool.c,v 1.3 2000/12/14 18:45:35 ghazi Exp $ +/* $Id: jartool.c,v 1.4 2000/12/28 21:47:37 robertl Exp $ $Log: jartool.c,v $ + Revision 1.4 2000/12/28 21:47:37 robertl + 2000-12-28 Robert Lipe <robertl@sco.com> + + * jartool.c (MAXPATHLEN): Provide if not defined. + Revision 1.3 2000/12/14 18:45:35 ghazi Warning fixes: @@ -218,6 +223,7 @@ int create_central_header(int); int make_manifest(int, const char*); static void init_args(char **, int); static char *get_next_arg (void); +static char *jt_strdup (char*); /* global variables */ ub1 file_header[30]; @@ -531,7 +537,7 @@ get_next_arg () if (pos) { s [pos] = '\0'; - return strdup (s); + return jt_strdup (s); } else return NULL; @@ -1821,3 +1827,14 @@ Example 2: use an existing manifest file 'mymanifest' and archive all the\n\ exit(1); } + +static char * +jt_strdup(s) + char *s; +{ + char *result = (char*)malloc(strlen(s) + 1); + if (result == (char*)0) + return (char*)0; + strcpy(result, s); + return result; +} |