* cfgrtl.c (redirect_edge_and_branch): Abort if redirect_jump fails.

[pf3gnuchains/gcc-fork.git] / fastjar / jartool.c

diff --git a/fastjar/jartool.c b/fastjar/jartool.c
index 0f65d12..150ffdc 100644 (file)
--- a/fastjar/jartool.c
+++ b/fastjar/jartool.c
@@ -17,9 +17,21 @@
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-/* $Id: jartool.c,v 1.5 2001/05/03 21:40:47 danglin 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.
+       (O_BINARY): Conditionally define.
+       (main): Use open, not creat.  Use O_BINARY everywhere.
+       (make_manifest): Use O_BINARY.
+       (add_to_jar): Likewise.
+
    Revision 1.5  2001/05/03 21:40:47  danglin
        * jartool.c (jt_strdup): New function.
        (get_next_arg): Use jt_strdup instead of strdup.
@@ -241,7 +253,7 @@ ub1 data_descriptor[16];
 int do_compress;
 int seekable;
 int verbose;
-char jarfile[256];
+char *jarfile;
 
 /* If non zero, then don't recurse in directory. Instead, add the
    directory entry and relie on an explicit list of files to populate
@@ -357,7 +369,7 @@ int main(int argc, char **argv){
     if(i >= argc)
       usage(argv[0]);
 
-    strncpy(jarfile, argv[i++], 256);
+    jarfile = jt_strdup (argv[i++]);
   }
   if(manifest_file){
     if(i >= argc)
@@ -370,7 +382,7 @@ int main(int argc, char **argv){
     if(i >= argc)
       usage(argv[0]);
 
-    strncpy(jarfile, argv[i++], 256);
+    jarfile = jt_strdup (argv[i++]);
   }
 
   /* create the jarfile */
@@ -791,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;