diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 684a0f2948ef000b9f60d58e8262aa3177c49950..0a6fcd8822ba9cecbb162b191e99d5bad775f5e3 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 f2922bdcb8f50574893577692b9f41a9fa6fd376..150ffdc33dbabdbc74ff43c83f8e9bb068f2806d 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;