diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-09 08:10:18 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-09 08:10:18 +0000 |
commit | c0f3e72caec3910bcc56cf882e713b6e71ca08f1 (patch) | |
tree | 142edb5d713908fcb8f8ba2bec260558b647ad5f /Build/source | |
parent | 6ccff4c232f2c867cef173c7bfc9ca79ea43a15d (diff) |
minor update to avoid some warnings
git-svn-id: svn://tug.org/texlive/trunk@21657 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog.TL | 5 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/config.h.in | 6 | ||||
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 4 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/configure.ac | 6 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/pdfencrypt.c | 28 |
5 files changed, 13 insertions, 36 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL index f083bfa8c17..4354565afec 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog.TL +++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx ================================================= +2011-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Check for <sys/wait.h>, drop check for system(). + * src/pdfencrypt.c (compute_id_string): Drop unused function. + 2011-03-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * src/dpxfile.c: Avoid to use system(). * src/dvi.c, src/dvi.h, src/dvipdfmx.c, src/pdfencript.c, diff --git a/Build/source/texk/xdvipdfmx/config.h.in b/Build/source/texk/xdvipdfmx/config.h.in index b44a0388429..b39a40e79ba 100644 --- a/Build/source/texk/xdvipdfmx/config.h.in +++ b/Build/source/texk/xdvipdfmx/config.h.in @@ -152,9 +152,6 @@ /* Define to 1 if `tm_zone' is a member of `struct tm'. */ #undef HAVE_STRUCT_TM_TM_ZONE -/* Define to 1 if you have the `system' function. */ -#undef HAVE_SYSTEM - /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H @@ -172,6 +169,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the <sys/wait.h> header file. */ +#undef HAVE_SYS_WAIT_H + /* Define if <time.h> has timezone as an external variable. */ #undef HAVE_TIMEZONE diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index aac21494224..64b29a61c28 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -12895,7 +12895,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h fi -for ac_header in stdint.h inttypes.h sys/types.h +for ac_header in stdint.h inttypes.h sys/types.h sys/wait.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -12971,7 +12971,7 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in esac -for ac_func in open close system getenv mkstemp basename +for ac_func in open close getenv mkstemp basename do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac index 89e7843cefa..1c0ab3393c5 100644 --- a/Build/source/texk/xdvipdfmx/configure.ac +++ b/Build/source/texk/xdvipdfmx/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -21,11 +21,11 @@ KPSE_LT_HACK dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([stdint.h inttypes.h sys/types.h]) +AC_CHECK_HEADERS([stdint.h inttypes.h sys/types.h sys/wait.h]) dnl Checks for library functions. AC_FUNC_MEMCMP -AC_CHECK_FUNCS([open close system getenv mkstemp basename]) +AC_CHECK_FUNCS([open close getenv mkstemp basename]) dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM diff --git a/Build/source/texk/xdvipdfmx/src/pdfencrypt.c b/Build/source/texk/xdvipdfmx/src/pdfencrypt.c index 8edf21acb06..7ce6c084764 100644 --- a/Build/source/texk/xdvipdfmx/src/pdfencrypt.c +++ b/Build/source/texk/xdvipdfmx/src/pdfencrypt.c @@ -78,34 +78,6 @@ void pdf_enc_set_verbose (void) if (verbose < 255) verbose++; } -#define PRODUCER "%s-%s, Copyright \251 2002 by Jin-Hwan Cho and Shunsaku Hirata" -static void compute_id_string (char *dviname, char *pdfname) -{ - char *date_string, *producer; - time_t current_time; - struct tm *bd_time; - - MD5_init(&md5_ctx); - - date_string = NEW (15, char); - time(¤t_time); - bd_time = localtime(¤t_time); - sprintf (date_string, "%04d%02d%02d%02d%02d%02d", - bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday, - bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec); - MD5_write(&md5_ctx, (unsigned char *)date_string, strlen(date_string)); - RELEASE (date_string); - - producer = NEW (strlen(PRODUCER)+strlen(PACKAGE)+strlen(VERSION), char); - sprintf(producer, PRODUCER, PACKAGE, VERSION); - MD5_write(&md5_ctx, (unsigned char *)producer, strlen(producer)); - RELEASE (producer); - - MD5_write(&md5_ctx, (unsigned char *)dviname, strlen(dviname)); - MD5_write(&md5_ctx, (unsigned char *)pdfname, strlen(pdfname)); - MD5_final(id_string, &md5_ctx); -} - static void passwd_padding (unsigned char *src, unsigned char *dst) { register int len = strlen((char *)src); |