diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-07-04 18:33:53 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-07-04 18:33:53 +0000 |
| commit | 72ea889aa5741088c055de3cf428c6d2ad895b29 (patch) | |
| tree | be285726d9525aba995523a95cf2043841ae3839 /fastjar | |
| parent | 2b1b6bf903b908e98ea861317289a3c15e0bd0df (diff) | |
| download | gcc-72ea889aa5741088c055de3cf428c6d2ad895b29.zip gcc-72ea889aa5741088c055de3cf428c6d2ad895b29.tar.gz gcc-72ea889aa5741088c055de3cf428c6d2ad895b29.tar.bz2 | |
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.
From-SVN: r43766
Diffstat (limited to 'fastjar')
| -rw-r--r-- | fastjar/ChangeLog | 9 | ||||
| -rw-r--r-- | fastjar/jartool.c | 25 |
2 files changed, 27 insertions, 7 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 8702928..d46ec26 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,12 @@ +2001-07-04 Tom Tromey <tromey@redhat.com> + + 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. + 2001-06-28 Tom Tromey <tromey@redhat.com> * configure: Rebuilt. diff --git a/fastjar/jartool.c b/fastjar/jartool.c index b719331..0f65d12 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.4 2000/12/28 21:47:37 robertl Exp $ +/* $Id: jartool.c,v 1.5 2001/05/03 21:40:47 danglin Exp $ $Log: jartool.c,v $ + 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. + Revision 1.4 2000/12/28 21:47:37 robertl 2000-12-28 Robert Lipe <robertl@sco.com> @@ -208,7 +212,13 @@ static char version_string[] = VERSION; +#ifndef errno extern int errno; +#endif + +#ifndef O_BINARY +#define O_BINARY 0 +#endif void usage(const char*); void add_entry(struct zipentry *); @@ -366,8 +376,9 @@ int main(int argc, char **argv){ /* create the jarfile */ if(action == ACTION_CREATE){ if(file){ - jarfd = creat(jarfile, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - + jarfd = open(jarfile, O_CREAT | O_BINARY | O_WRONLY | O_TRUNC, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if(jarfd < 0){ fprintf(stderr, "Error opening %s for writing!\n", jarfile); perror(jarfile); @@ -391,7 +402,7 @@ int main(int argc, char **argv){ } else if(action == ACTION_LIST || action == ACTION_EXTRACT){ if(file){ - jarfd = open(jarfile, O_RDONLY); + jarfd = open(jarfile, O_RDONLY | O_BINARY); if(jarfd < 0){ fprintf(stderr, "Error opening %s for reading!\n", jarfile); @@ -413,7 +424,7 @@ int main(int argc, char **argv){ init_headers(); if((action == ACTION_UPDATE) && file) { - if((jarfd = open(jarfile, O_RDWR)) < 0) { + if((jarfd = open(jarfile, O_RDWR | O_BINARY)) < 0) { fprintf(stderr, "Error opening %s for reading!\n", jarfile); perror(jarfile); exit(1); @@ -724,7 +735,7 @@ int make_manifest(int jfd, const char *mf_name){ exit(1); } - mfd = open(mf_name, O_RDONLY); + mfd = open(mf_name, O_RDONLY | O_BINARY); if(mfd < 0){ fprintf(stderr, "Error opening %s.\n", mf_name); @@ -870,7 +881,7 @@ int add_to_jar(int fd, const char *new_dir, const char *file){ } else if(S_ISREG(statbuf.st_mode)){ int add_fd; - add_fd = open(file, O_RDONLY); + add_fd = open(file, O_RDONLY | O_BINARY); if(add_fd < 0){ fprintf(stderr, "Error opening %s.\n", file); return 0; |