summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorapbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-29 01:35:32 +0000
committerapbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-29 01:35:32 +0000
commit40d55fb36a7c0005c96ed46383498ea13a576b67 (patch)
treefebf5e4f6ff46001ceb1cdda4ff9ff98a4286e4b
parente4cedf550c4007e714c901d12e75396ae1293f37 (diff)
downloadgcc-40d55fb36a7c0005c96ed46383498ea13a576b67.tar.gz
2001-08-28 Alexandre Petit-Bianco <apbianco@redhat.com>
* jartool.c (add_to_jar): Return 1 if `stat' initialy failed. Fixes PR java/3949. (http://gcc.gnu.org/ml/gcc-patches/2001-08/msg01641.html) git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45250 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--fastjar/ChangeLog5
-rw-r--r--fastjar/jartool.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 684a0f2948e..0a6fcd8822b 100644
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-28 Alexandre Petit-Bianco <apbianco@redhat.com>
+
+ * jartool.c (add_to_jar): Return 1 if `stat' initialy failed.
+ Fixes PR java/3949.
+
2001-08-27 Tom Tromey <tromey@redhat.com>
* jartool.c (jarfile): Remove length limitation.
diff --git a/fastjar/jartool.c b/fastjar/jartool.c
index f2922bdcb8f..150ffdc33db 100644
--- a/fastjar/jartool.c
+++ b/fastjar/jartool.c
@@ -17,9 +17,13 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* $Id: jartool.c,v 1.6 2001/07/04 18:33:53 tromey Exp $
+/* $Id: jartool.c,v 1.7 2001/08/27 23:09:37 tromey Exp $
$Log: jartool.c,v $
+ Revision 1.7 2001/08/27 23:09:37 tromey
+ * jartool.c (jarfile): Remove length limitation.
+ (main): Use jt_strdup when initializing jarfile.
+
Revision 1.6 2001/07/04 18:33:53 tromey
Modified from patch by Julian Hall <jules@acris.co.uk>:
* jartool.c (errno): Conditionally declare.
@@ -799,6 +803,7 @@ int add_to_jar(int fd, const char *new_dir, const char *file){
if(stat_return == -1){
perror(file);
+ return 1;
} else if(S_ISDIR(statbuf.st_mode)){
char *fullname;
char *t_ptr;