OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jartool.c (add_to_jar): Only compare file to jarfile if jarfile is non-NULL.

Browse Source 
* jartool.c (add_to_jar): Only compare file to jarfile if jarfile is
	non-NULL.

	* configure.in (AC_CHECK_HEADERS): Add limits.h.
	* configure, config.h.in: Rebuilt.

From-SVN: r58990
This commit is contained in:
Jakub Jelinek 2002-11-10 22:04:24 +01:00 committed by Jakub Jelinek
parent 7bb9f927b8
commit 9d8f417b41
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fastjar/ChangeLog
View File

@ -1,3 +1,11 @@
2002-10-10 Jakub Jelinek <jakub@redhat.com>
* jartool.c (add_to_jar): Only compare file to jarfile if jarfile is
non-NULL.
* configure.in (AC_CHECK_HEADERS): Add limits.h.
* configure, config.h.in: Rebuilt.
2002-11-07 Tom Tromey <tromey@redhat.com>
* dostime.c: Rewrote from scratch.

3
fastjar/config.h.in
View File

@ -21,6 +21,9 @@
/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define if you have the <sys/dir.h> header file. */
#undef HAVE_SYS_DIR_H

2
fastjar/configure vendored
View File

@ -1691,7 +1691,7 @@ EOF
fi
for ac_hdr in fcntl.h unistd.h sys/param.h stdlib.h
for ac_hdr in fcntl.h unistd.h sys/param.h stdlib.h limits.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

2
fastjar/configure.in
View File

@ -24,7 +24,7 @@ dnl Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_STRUCT_TM
AC_CHECK_HEADERS(fcntl.h unistd.h sys/param.h stdlib.h)
AC_CHECK_HEADERS(fcntl.h unistd.h sys/param.h stdlib.h limits.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_OFF_T

5
fastjar/jartool.c
View File

@ -843,7 +843,7 @@ int add_to_jar(int fd, const char *new_dir, const char *file){
}
}
if(!strcmp(file, jarfile)){
if(jarfile && !strcmp(file, jarfile)){
if(verbose)
printf("skipping: %s\n", file);
return 0; /* we don't want to add ourselves.. */
@ -924,7 +924,8 @@ int add_to_jar(int fd, const char *new_dir, const char *file){
while(!use_explicit_list_only && (de = readdir(dir)) != NULL){
if(de->d_name[0] == '.')
continue;
if(!strcmp(de->d_name, jarfile)){ /* we don't want to add ourselves. Believe me */
if(jarfile && !strcmp(de->d_name, jarfile)){
/* we don't want to add ourselves. Believe me */
if(verbose)
printf("skipping: %s\n", de->d_name);
continue;