Ticket #176: patch-2.5.4.patch

File patch-2.5.4.patch, 40.3 KB (added by Yuri Dario, 17 years ago)

Patches for building gnu patch 2.5.4

  • aclocal.m4 

    Only in patch-2.5.4: .svn
diff -urbB patch-2.5.4.0/aclocal.m4 patch-2.5.4/aclocal.m4
    old new  
     1undefine([AC_SYS_LARGEFILE])
     2
    13# The following is taken from automake 1.4,
    24# except that it prefers the compiler option -Ae to "-Aa -D_HPUX_SOURCE"
    35# because only the former supports 64-bit integral types on HP-UX 10.20.

  • patch-2.5.4 

    diff -urbB patch-2.5.4.0/common.h patch-2.5.4/common.h
    old new  
    124124
    125125
    126126#ifndef FILESYSTEM_PREFIX_LEN
    127 #define FILESYSTEM_PREFIX_LEN(f) 0
     127# ifndef __EMX__
     128#  define FILESYSTEM_PREFIX_LEN(f) 0
     129# else
     130#  define FILESYSTEM_PREFIX_LEN(f) ((f)[0] && (f)[1] == ':' ? 2 : 0)
     131# endif /* __EMX__ */
    128132#endif
    129133
    130134#ifndef ISSLASH
    131 #define ISSLASH(c) ((c) == '/')
     135# ifndef __EMX__
     136#  define ISSLASH(c) ((c) == '/')
     137# else
     138#  define ISSLASH(c) ((c) == '/' ||  (c) == '\\')
     139# endif /* __EMX__ */
    132140#endif
    133141
    134142
    … …  
    324332#endif
    325333
    326334#ifndef TTY_DEVICE
    327 #define TTY_DEVICE "/dev/tty"
     335# ifndef __EMX__
     336#  define TTY_DEVICE "/dev/tty"
     337# else
     338#  define TTY_DEVICE "/dev/con"
     339# endif
     340#endif
     341
     342#ifdef __EMX__00_YD
     343# ifndef chdir
     344#  define chdir _chdir2
     345# endif
     346# ifndef getcwd
     347#  define getcwd _getcwd2
     348# endif
     349# if !HAVE_STRNCASECMP && !defined(strncasecmp)
     350#  define strncasecmp strnicmp
     351# endif
    328352#endif
     353

  • config.hin 

    Only in patch-2.5.4: config.guess
Only in patch-2.5.4.0: config.guess0
Only in patch-2.5.4: config.h
diff -urbB patch-2.5.4.0/config.hin patch-2.5.4/config.hin
    old new  
    11/* config.hin.  Generated automatically from configure.in by autoheader.  */
    22
    3 /* Define if on AIX 3.
    4    System headers sometimes define this.
    5    We just want to avoid a redefinition error message.  */
    6 #ifndef _ALL_SOURCE
    7 #undef _ALL_SOURCE
     3#include<stdlib.h>
     4
     5#include<errno.h>
     6
     7/* Replace chdir() by _chdir2() if necessary (EMX only) */
     8#if defined EMX_REPLACE_CHDIR && !defined chdir
     9#define chdir replace_chdir
     10static inline int replace_chdir(const char *name) { return _chdir2(name); }
    811#endif
    912
    10 /* Define if the closedir function returns void instead of int. */
     13/* Define if the `closedir' function returns void instead of `int'. */
    1114#undef CLOSEDIR_VOID
    1215
    13 /* Define to empty if the keyword does not work. */
     16/* Define to empty if `const' does not conform to ANSI C. */
    1417#undef const
    1518
    16 /* Define if you don't have vprintf but do have _doprnt.  */
    17 #undef HAVE_DOPRNT
     19/* Define if there is a member named d_ino in the struct describing directory
     20   headers. */
     21#undef D_INO_IN_DIRENT
    1822
    19 /* Define if you support file names longer than 14 characters. */
    20 #undef HAVE_LONG_FILE_NAMES
     23/* EMX needs _chdir2() */
     24#undef EMX_REPLACE_CHDIR
    2125
    22 /* Define if you have the vprintf function. */
    23 #undef HAVE_VPRINTF
     26/* EMX needs _getcwd2() */
     27#undef EMX_REPLACE_GETCWD
    2428
    25 /* Define if on MINIX.  */
    26 #undef _MINIX
     29/* Replace getcwd() by _getcwd2() if necessary (EMX only) */
     30#if defined EMX_REPLACE_GETCWD && !defined getcwd
     31#define getcwd replace_getcwd
     32static inline char* replace_getcwd(char *buffer, size_t size) { return _getcwd2(buffer, size); }
     33#endif
    2734
    28 /* Define to `int' if <sys/types.h> doesn't define. */
    29 #undef mode_t
     35/* Define if you have the `chdir' function. */
     36#undef HAVE_CHDIR
    3037
    31 /* Define to `long' if <sys/types.h> doesn't define. */
    32 #undef off_t
     38/* Define if you have the `chown' function. */
     39#undef HAVE_CHOWN
    3340
    34 /* Define to `int' if <sys/types.h> doesn't define. */
    35 #undef pid_t
     41/* Define if you have the <dirent.h> header file, and it defines `DIR'. */
     42#undef HAVE_DIRENT_H
    3643
    37 /* Define if the system does not provide POSIX.1 features except
    38    with this defined.  */
    39 #undef _POSIX_1_SOURCE
     44/* Define if the malloc check has been performed. */
     45#undef HAVE_DONE_WORKING_MALLOC_CHECK
    4046
    41 /* Define if you need to in order for stat and other things to work. */
    42 #undef _POSIX_SOURCE
     47/* Define if the realloc check has been performed. */
     48#undef HAVE_DONE_WORKING_REALLOC_CHECK
    4349
    44 /* Define as the return type of signal handlers (int or void). */
    45 #undef RETSIGTYPE
     50/* Define if you don't have `vprintf' but do have `_doprnt.' */
     51#undef HAVE_DOPRNT
    4652
    47 /* Define to `unsigned' if <sys/types.h> doesn't define. */
    48 #undef size_t
     53/* Define if you have the `fchown' function. */
     54#undef HAVE_FCHOWN
    4955
    50 /* Define if you have the ANSI C header files. */
    51 #undef STDC_HEADERS
     56/* Define if you have the <fcntl.h> header file. */
     57#undef HAVE_FCNTL_H
    5258
    53 /* Define if you can safely include both <sys/time.h> and <time.h>. */
    54 #undef TIME_WITH_SYS_TIME
     59/* Define if you have the `fseeko' function. */
     60#undef HAVE_FSEEKO
    5561
    56 /* Define if you have the _doprintf function. */
    57 #undef HAVE__DOPRINTF
     62/* Define if you have the `getcwd' function. */
     63#undef HAVE_GETCWD
    5864
    59 /* Define if you have the fseeko function. */
    60 #undef HAVE_FSEEKO
     65/* Define if you have the <inttypes.h> header file. */
     66#undef HAVE_INTTYPES_H
    6167
    62 /* Define if you have the isascii function. */
     68/* Define if you have the `isascii' function. */
    6369#undef HAVE_ISASCII
    6470
    65 /* Define if you have the memchr function.  */
     71/* Define if you have the `lchown' function. */
     72#undef HAVE_LCHOWN
     73
     74/* Define if you have the <limits.h> header file. */
     75#undef HAVE_LIMITS_H
     76
     77/* Define if you have the `link' function. */
     78#undef HAVE_LINK
     79
     80/* Define if you support file names longer than 14 characters. */
     81#undef HAVE_LONG_FILE_NAMES
     82
     83/* Define if you have the `lstat' function. */
     84#undef HAVE_LSTAT
     85
     86/* Define if you have the `memchr' function. */
    6687#undef HAVE_MEMCHR
    6788
    68 /* Define if you have the memcmp function. */
     89/* Define if you have the `memcmp' function. */
    6990#undef HAVE_MEMCMP
    7091
    71 /* Define if you have the mkdir function.  */
     92/* Define if you have the <memory.h> header file. */
     93#undef HAVE_MEMORY_H
     94
     95/* Define if you have the `mkdir' function. */
    7296#undef HAVE_MKDIR
    7397
    74 /* Define if you have the mktemp function.  */
     98/* Define if you have the `mkfifo' function. */
     99#undef HAVE_MKFIFO
     100
     101/* Define if you have the `mknod' function. */
     102#undef HAVE_MKNOD
     103
     104/* Define if you have the `mktemp' function. */
    75105#undef HAVE_MKTEMP
    76106
    77 /* Define if you have the pathconf function.  */
     107/* Define if you have the <ndir.h> header file, and it defines `DIR'. */
     108#undef HAVE_NDIR_H
     109
     110/* Define if you have the <os2.h> header file. */
     111#undef HAVE_OS2_H
     112
     113/* Define if you have the `pathconf' function. */
    78114#undef HAVE_PATHCONF
    79115
    80 /* Define if you have the raise function. */
     116/* Define if you have the `raise' function. */
    81117#undef HAVE_RAISE
    82118
    83 /* Define if you have the rename function.  */
     119/* Define if you have the `readlink' function. */
     120#undef HAVE_READLINK
     121
     122/* Define if you have the `rename' function. */
    84123#undef HAVE_RENAME
    85124
    86 /* Define if you have the rmdir function. */
     125/* Define if you have the `rmdir' function. */
    87126#undef HAVE_RMDIR
    88127
    89 /* Define if you have the setmode function. */
     128/* Define if you have the `setmode' function. */
    90129#undef HAVE_SETMODE
    91130
    92 /* Define if you have the sigaction function. */
     131/* Define if you have the `sigaction' function. */
    93132#undef HAVE_SIGACTION
    94133
    95 /* Define if you have the sigprocmask function. */
     134/* Define if you have the `sigprocmask' function. */
    96135#undef HAVE_SIGPROCMASK
    97136
    98 /* Define if you have the sigsetmask function. */
     137/* Define if you have the `sigsetmask' function. */
    99138#undef HAVE_SIGSETMASK
    100139
    101 /* Define if you have the strerror function. */
    102 #undef HAVE_STRERROR
     140/* Define if you have the `stat' function. */
     141#undef HAVE_STAT
    103142
    104 /* Define if you have the <dirent.h> header file. */
    105 #undef HAVE_DIRENT_H
     143/* Define if you have the <stdlib.h> header file. */
     144#undef HAVE_STDLIB_H
    106145
    107 /* Define if you have the <fcntl.h> header file. */
    108 #undef HAVE_FCNTL_H
     146/* Define if you have the `strcasecmp' function. */
     147#undef HAVE_STRCASECMP
    109148
    110 /* Define if you have the <limits.h> header file. */
    111 #undef HAVE_LIMITS_H
     149/* Define if you have the `strerror' function. */
     150#undef HAVE_STRERROR
    112151
    113 /* Define if you have the <ndir.h> header file.  */
    114 #undef HAVE_NDIR_H
     152/* Define if you have the `stricmp' function. */
     153#undef HAVE_STRICMP
     154
     155/* Define if you have the <strings.h> header file. */
     156#undef HAVE_STRINGS_H
    115157
    116158/* Define if you have the <string.h> header file.  */
    117159#undef HAVE_STRING_H
    118160
    119 /* Define if you have the <sys/dir.h> header file.  */
     161/* Define if you have the `strncasecmp' function. */
     162#undef HAVE_STRNCASECMP
     163
     164/* Define if you have the `strnicmp' function. */
     165#undef HAVE_STRNICMP
     166
     167/* Define if struct utimbuf is declared -- usually in <utime.h>. Some systems
     168   have utime.h but don't declare the struct anywhere. */
     169#undef HAVE_STRUCT_UTIMBUF
     170
     171/* Define if you have the `symlink' function. */
     172#undef HAVE_SYMLINK
     173
     174/* Define if you have the `sync' function. */
     175#undef HAVE_SYNC
     176
     177/* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
    120178#undef HAVE_SYS_DIR_H
    121179
    122 /* Define if you have the <sys/ndir.h> header file. */
     180/* Define if you have the <sys/ndir.h> header file, and it defines `DIR'. */
    123181#undef HAVE_SYS_NDIR_H
    124182
     183/* Define if you have the <sys/nls.h> header file. */
     184#undef HAVE_SYS_NLS_H
     185
    125186/* Define if you have the <unistd.h> header file.  */
    126187#undef HAVE_UNISTD_H
    127188
    … …  
    131192/* Define if you have the <varargs.h> header file.  */
    132193#undef HAVE_VARARGS_H
    133194
    134 /* Number of bits in a file offset, on hosts where this is settable. */
    135 #undef _FILE_OFFSET_BITS
     195/* Define if you have the `vprintf' function. */
     196#undef HAVE_VPRINTF
    136197
    137 /* Define to make fseeko etc. visible, on some hosts. */
    138 #undef _LARGEFILE_SOURCE
     198/* Define if you have the `_chdir2' function. */
     199#undef HAVE__CHDIR2
    139200
    140 /* Define for large files, on AIX-style hosts. */
    141 #undef _LARGE_FILES
     201/* Define if you have the `_doprintf' function. */
     202#undef HAVE__DOPRINTF
    142203
    143 /* Define if compiler has function prototypes */
    144 #undef PROTOTYPES
     204/* Define if you have the `_getcwd2' function. */
     205#undef HAVE__GETCWD2
    145206
    146 /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
    147    and declares uintmax_t.  */
    148 #undef HAVE_INTTYPES_H
     207/* Define if you have the `_nls_init' function. */
     208#undef HAVE__NLS_INIT
    149209
    150 /* Define if struct utimbuf is declared -- usually in <utime.h>.
    151    Some systems have utime.h but don't declare the struct anywhere.  */
    152 #undef HAVE_STRUCT_UTIMBUF
     210/* Define if you have the `_response' function. */
     211#undef HAVE__RESPONSE
    153212
    154 /* Define if the malloc check has been performed. */
    155 #undef HAVE_DONE_WORKING_MALLOC_CHECK
     213/* Define if you have the `_wildcard' function. */
     214#undef HAVE__WILDCARD
    156215
    157216/* Define to rpl_malloc if the replacement function should be used. */
    158217#undef malloc
    159218
    160 /* Define if the realloc check has been performed.  */
    161 #undef HAVE_DONE_WORKING_REALLOC_CHECK
     219/* Define to `int' if <sys/types.h> does not define. */
     220#undef mode_t
     221
     222/* Define to `long' if <sys/types.h> does not define. */
     223#undef off_t
     224
     225/* Define to `int' if <sys/types.h> does not define. */
     226#undef pid_t
     227
     228/* Define if compiler has function prototypes */
     229#undef PROTOTYPES
    162230
    163231/* Define to rpl_realloc if the replacement function should be used. */
    164232#undef realloc
    165233
    166 /* Define if there is a member named d_ino in the struct describing
    167    directory headers. */
    168 #undef D_INO_IN_DIRENT
     234/* Define as the return type of signal handlers (`int' or `void'). */
     235#undef RETSIGTYPE
     236
     237/* Define to `unsigned' if <sys/types.h> does not define. */
     238#undef size_t
     239
     240/* Define if you have the ANSI C header files. */
     241#undef STDC_HEADERS
     242
     243/* Define if you can safely include both <sys/time.h> and <time.h>. */
     244#undef TIME_WITH_SYS_TIME
     245
     246/* If libc does not support chown(), replace it by a dummy function */
     247#if !HAVE_CHOWN && !defined chown
     248static inline int replace_chown(const char *file, unsigned uid, unsigned gid) { errno = EPERM; return -1; }
     249#define chown(x,y,z) replace_chown(x,y,z)
     250#endif
     251
     252/* If libc does not support fchown(), replace it by a dummy function */
     253#if !HAVE_FCHOWN && !defined fchown
     254static inline int replace_fchown(int fd, unsigned owner, unsigned group) { errno = EPERM; return -1; }
     255#define fchown(x,y,z) replace_fchown(x,y,z)
     256#endif
     257
     258/* If libc does not support lchown(), replace it by chown */
     259#if !HAVE_LCHOWN && !defined lchown
     260static inline int replace_lchown(const char *file, unsigned uid, unsigned gid) { errno = EPERM; return -1; }
     261#define lchown replace_lchown
     262#endif
     263
     264/* If libc does not support link(), replace it by a dummy function */
     265#if !HAVE_LINK && !defined link
     266static inline int replace_link(const char *oldpath, const char *newpath) { errno = EPERM; return -1; }
     267#define link replace_link
     268#endif
     269
     270/* If libc does not support lstat(), replace it by stat() (EMX only) */
     271#if !HAVE_LSTAT && HAVE_STAT && !defined lstat
     272# define lstat stat
     273#endif
    169274
     275/* If libc does not support mkfifo(), replace it by a dummy function */
     276#if !HAVE_MKFIFO && !defined mkfifo
     277static inline int replace_mkfifo(const char *pathname, unsigned mode) { errno = EPERM; return -1; }
     278#define mkfifo(x,y) replace_mkfifo(x,y)
     279#endif
     280
     281/* If libc does not support mknod(), replace it by a dummy function */
     282#if !HAVE_MKNOD && !defined mknod
     283static inline int replace_mknod(const char *pathname, unsigned mode, unsigned dev) { errno = EPERM; return -1; }
     284#define mknod(x,y,z) replace_mknod(x,y,z)
     285#endif
     286
     287/* If libc does not support readlink(), replace it by a dummy function */
     288#if !HAVE_READLINK && !defined readlink
     289static inline int replace_readlink(const char *path, char *buf, size_t bufsize) { errno = EPERM; return -1; }
     290#define readlink replace_readlink
     291#endif
     292
     293/* Replace strcasecmp() by stricmp() if necessary (EMX only) */
     294#if !HAVE_STRCASECMP && HAVE_STRICMP && !defined strcasecmp
     295# define strcasecmp(x,y) stricmp(x,y)
     296#endif
     297
     298/* Replace strncasecmp() by strnicmp() if necessary (EMX only) */
     299#if !HAVE_STRNCASECMP && HAVE_STRNICMP && !defined strncasecmp
     300# define strncasecmp strnicmp
     301#endif
     302
     303/* If libc does not support symlink(), replace it by a dummy function */
     304#if !HAVE_SYMLINK && !defined symlink
     305static inline int replace_symlink(const char *oldpath, const char *newpath) { errno = EPERM; return -1; }
     306#define symlink replace_symlink
     307#endif
     308
     309/* If libc does not support sync(), replace it by an empty macro */
     310#if !HAVE_SYNC && !defined sync
     311#define sync() {}
     312#endif
     313
     314/* Define if on AIX 3.
     315   System headers sometimes define this.
     316   We just want to avoid a redefinition error message.  */
     317#ifndef _ALL_SOURCE
     318# undef _ALL_SOURCE
     319#endif
     320
     321/* Number of bits in a file offset, on hosts where this is settable. */
     322#undef _FILE_OFFSET_BITS
     323
     324#if HAVE__RESPONSE && defined __EMX__
     325# define _EMX_RESPONSE(a, b) _response(a, b)
     326#else
     327# define _EMX_RESPONSE(a, b)
     328#endif
     329
     330#if HAVE__WILDCARD && defined __EMX__
     331# define _EMX_WILDCARD(a, b) _wildcard(a, b)
     332#else
     333# define _EMX_WILDCARD(a, b)
     334#endif
     335
     336#if HAVE_SYS_NLS_H && HAVE__NLS_INIT
     337# include<sys/nls.h>
     338# define TOUPPER(x) _nls_toupper(x)
     339# define TOLOWER(x) _nls_tolower(x)
     340#endif
     341
     342#if (HAVE__RESPONSE || HAVE__WILDCARD) && !defined initialize_main
     343# define initialize_main(pargc, pargv) { \
     344_EMX_RESPONSE(pargc, pargv); _EMX_WILDCARD(pargc, pargv); }
     345#endif
     346
     347/* Define to make fseeko etc. visible, on some hosts. */
     348#undef _LARGEFILE_SOURCE
     349
     350/* Define for large files, on AIX-style hosts. */
     351#undef _LARGE_FILES
     352
     353/* Define if on MINIX. */
     354#undef _MINIX
     355
     356/* Define if the system does not provide POSIX.1 features except with this
     357   defined. */
     358#undef _POSIX_1_SOURCE
     359
     360/* Define if you need to in order for stat and other things to work. */
     361#undef _POSIX_SOURCE

  • config.sub 

    Only in patch-2.5.4: config.log
Only in patch-2.5.4: config.status
diff -urbB patch-2.5.4.0/config.sub patch-2.5.4/config.sub
    old new  
    11#! /bin/sh
    2 # Configuration validation subroutine script, version 1.1.
    3 #   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
     2# Configuration validation subroutine script.
     3#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     4#   Free Software Foundation, Inc.
     5
     6timestamp='2001-05-11'
     7
    48# This file is (in principle) common to ALL GNU software.
    59# The presence of a machine in this file suggests that SOME GNU software
    610# can handle that machine.  It does not imply ALL GNU software can.
    … …  
    2529# configuration script generated by Autoconf, you may include it under
    2630# the same distribution terms that you use for the rest of that program.
    2731
     32# Please send patches to <config-patches@gnu.org>.
     33#
    2834# Configuration subroutine to validate and canonicalize a configuration type.
    2935# Supply the specified configuration type as an argument.
    3036# If it is invalid, we print an error message on stderr and exit with code 1.
    … …  
    4551#       CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    4652# It is wrong to echo any other type of specification.
    4753
    48 if [ x$1 = x ]
    49 then
    50         echo Configuration name missing. 1>&2
    51         echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
    52         echo "or     $0 ALIAS" 1>&2
    53         echo where ALIAS is a recognized configuration type. 1>&2
    54         exit 1
    55 fi
     54me=`echo "$0" | sed -e 's,.*/,,'`
     55
     56usage="\
     57Usage: $0 [OPTION] CPU-MFR-OPSYS
     58       $0 [OPTION] ALIAS
     59
     60Canonicalize a configuration name.
     61
     62Operation modes:
     63  -h, --help         print this help, then exit
     64  -t, --time-stamp   print date of last modification, then exit
     65  -v, --version      print version number, then exit
     66
     67Report bugs and patches to <config-patches@gnu.org>."
     68
     69version="\
     70GNU config.sub ($timestamp)
     71
     72Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
     73Free Software Foundation, Inc.
     74
     75This is free software; see the source for copying conditions.  There is NO
     76warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     77
     78help="
     79Try \`$me --help' for more information."
     80
     81# Parse command line
     82while test $# -gt 0 ; do
     83  case $1 in
     84    --time-stamp | --time* | -t )
     85       echo "$timestamp" ; exit 0 ;;
     86    --version | -v )
     87       echo "$version" ; exit 0 ;;
     88    --help | --h* | -h )
     89       echo "$usage"; exit 0 ;;
     90    -- )     # Stop option processing
     91       shift; break ;;
     92    - ) # Use stdin as input.
     93       break ;;
     94    -* )
     95       echo "$me: invalid option $1$help"
     96       exit 1 ;;
    5697
    57 # First pass through any local machine types.
    58 case $1 in
    5998        *local*)
     99       # First pass through any local machine types.
    60100                echo $1
    61                 exit 0
    62                 ;;
    63         *)
    64         ;;
     101       exit 0;;
     102
     103    * )
     104       break ;;
     105  esac
     106done
     107
     108case $# in
     109 0) echo "$me: missing argument$help" >&2
     110    exit 1;;
     111 1) ;;
     112 *) echo "$me: too many arguments$help" >&2
     113    exit 1;;
    65114esac
    66115
    67116# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
    68117# Here we must recognize all the valid KERNEL-OS combinations.
    69118maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    70119case $maybe_os in
    71   linux-gnu*)
     120  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
    72121    os=-$maybe_os
    73122    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    74123    ;;
    … …  
    94143        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
    95144        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
    96145        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
    97         -apple)
     146        -apple | -axis)
    98147                os=
    99148                basic_machine=$1
    100149                ;;
    … …  
    166215case $basic_machine in
    167216        # Recognize the basic CPU types without company name.
    168217        # Some are omitted here because they have special meanings below.
    169         tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
    170                 | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
     218        tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
     219                | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
     220                | pyramid | mn10200 | mn10300 | tron | a29k \
    171221                | 580 | i960 | h8300 \
     222                | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
    172223                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
    173                 | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
    174                 | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
    175                 | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
     224                | hppa64 \
     225                | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
     226                | alphaev6[78] \
     227                | we32k | ns16k | clipper | i370 | sh | sh[34] \
     228                | powerpc | powerpcle \
     229                | 1750a | dsp16xx | pdp10 | pdp11 \
     230                | mips16 | mips64 | mipsel | mips64el \
    176231                | mips64orion | mips64orionel | mipstx39 | mipstx39el \
    177232                | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
    178                 | mips64vr5000 | miprs64vr5000el | mcore \
    179                 | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
    180                 | thumb | d10v)
     233                | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
     234                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
     235                | v850 | c4x \
     236                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
     237                | pj | pjl | h8500 | z8k)
    181238                basic_machine=$basic_machine-unknown
    182239                ;;
    183         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
     240        m6811 | m68hc11 | m6812 | m68hc12)
     241                # Motorola 68HC11/12.
     242                basic_machine=$basic_machine-unknown
     243                os=-none
     244                ;;
     245        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65 | z8k)
    184246                ;;
    185247
    186248        # We use `pc' rather than `unknown'
    187249        # because (1) that's what they normally are, and
    188250        # (2) the word "unknown" tends to confuse beginning users.
    189         i[34567]86)
     251        i*86 | x86_64)
    190252          basic_machine=$basic_machine-pc
    191253          ;;
    192254        # Object if more than one company name word.
    … …  
    196258                ;;
    197259        # Recognize the basic CPU types with company name.
    198260        # FIXME: clean up the formatting here.
    199         vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
    200               | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
     261        vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
     262              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
     263              | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
    201264              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
    202265              | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
    203266              | xmp-* | ymp-* \
    204               | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
    205               | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
     267              | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
     268              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
     269              | hppa2.0n-* | hppa64-* \
     270              | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
     271              | alphaev6[78]-* \
    206272              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
    207273              | clipper-* | orion-* \
    208               | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
    209               | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
     274              | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
     275              | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
     276              | mips16-* | mips64-* | mipsel-* \
    210277              | mips64el-* | mips64orion-* | mips64orionel-* \
    211278              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
    212279              | mipstx39-* | mipstx39el-* | mcore-* \
    213               | f301-* | armv*-* | t3e-* \
     280              | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
     281              | [cjt]90-* \
    214282              | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
    215               | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
     283              | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
     284              | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
    216285                ;;
    217286        # Recognize the various machine names and aliases which stand
    218287        # for a CPU type and a company and sometimes even an OS.
    … …  
    249318                os=-sysv
    250319                ;;
    251320        amiga | amiga-*)
    252                 basic_machine=m68k-cbm
     321                basic_machine=m68k-unknown
    253322                ;;
    254323        amigaos | amigados)
    255                 basic_machine=m68k-cbm
     324                basic_machine=m68k-unknown
    256325                os=-amigaos
    257326                ;;
    258327        amigaunix | amix)
    259                 basic_machine=m68k-cbm
     328                basic_machine=m68k-unknown
    260329                os=-sysv4
    261330                ;;
    262331        apollo68)
    … …  
    303372                basic_machine=cray2-cray
    304373                os=-unicos
    305374                ;;
    306         [ctj]90-cray)
    307                 basic_machine=c90-cray
     375        [cjt]90)
     376                basic_machine=${basic_machine}-cray
    308377                os=-unicos
    309378                ;;
    310379        crds | unos)
    311380                basic_machine=m68k-crds
    312381                ;;
     382        cris | cris-* | etrax*)
     383                basic_machine=cris-axis
     384                ;;
    313385        da30 | da30-*)
    314386                basic_machine=m68k-da30
    315387                ;;
    … …  
    357429                basic_machine=tron-gmicro
    358430                os=-sysv
    359431                ;;
     432        go32)
     433                basic_machine=i386-pc
     434                os=-go32
     435                ;;
    360436        h3050r* | hiux*)
    361437                basic_machine=hppa1.1-hitachi
    362438                os=-hiuxwe2
    … …  
    430506                ;;
    431507        i370-ibm* | ibm*)
    432508                basic_machine=i370-ibm
    433                 os=-mvs
    434509                ;;
    435510# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
    436         i[34567]86v32)
     511        i*86v32)
    437512                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    438513                os=-sysv32
    439514                ;;
    440         i[34567]86v4*)
     515        i*86v4*)
    441516                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    442517                os=-sysv4
    443518                ;;
    444         i[34567]86v)
     519        i*86v)
    445520                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    446521                os=-sysv
    447522                ;;
    448         i[34567]86sol2)
     523        i*86sol2)
    449524                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    450525                os=-solaris2
    451526                ;;
    … …  
    457532                basic_machine=i386-unknown
    458533                os=-vsta
    459534                ;;
    460         i386-go32 | go32)
    461                 basic_machine=i386-unknown
    462                 os=-go32
    463                 ;;
    464         i386-mingw32 | mingw32)
    465                 basic_machine=i386-unknown
    466                 os=-mingw32
    467                 ;;
    468535        iris | iris4d)
    469536                basic_machine=mips-sgi
    470537                case $os in
    … …  
    490557                basic_machine=ns32k-utek
    491558                os=-sysv
    492559                ;;
     560        mingw32)
     561                basic_machine=i386-pc
     562                os=-mingw32
     563                ;;
    493564        miniframe)
    494565                basic_machine=m68000-convergent
    495566                ;;
    … …  
    511582        mips3*)
    512583                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
    513584                ;;
     585        mmix*)
     586                basic_machine=mmix-knuth
     587                os=-mmixware
     588                ;;
    514589        monitor)
    515590                basic_machine=m68k-rom68k
    516591                os=-coff
    517592                ;;
    518593        msdos)
    519                 basic_machine=i386-unknown
     594                basic_machine=i386-pc
    520595                os=-msdos
    521596                ;;
     597        mvs)
     598                basic_machine=i370-ibm
     599                os=-mvs
     600                ;;
    522601        ncr3000)
    523602                basic_machine=i486-ncr
    524603                os=-sysv4
    … …  
    528607                os=-netbsd
    529608                ;;
    530609        netwinder)
    531                 basic_machine=armv4l-corel
     610                basic_machine=armv4l-rebel
    532611                os=-linux
    533612                ;;
    534613        news | news700 | news800 | news900)
    … …  
    576655                basic_machine=i960-intel
    577656                os=-mon960
    578657                ;;
     658        nonstopux)
     659                basic_machine=mips-compaq
     660                os=-nonstopux
     661                ;;
    579662        np1)
    580663                basic_machine=np1-gould
    581664                ;;
     665        nsr-tandem)
     666                basic_machine=nsr-tandem
     667                ;;
    582668        op50n-* | op60c-*)
    583669                basic_machine=hppa1.1-oki
    584670                os=-proelf
    … …  
    608694        pc532 | pc532-*)
    609695                basic_machine=ns32k-pc532
    610696                ;;
    611         pentium | p5 | k5 | k6 | nexen)
     697        pentium | p5 | k5 | k6 | nexgen)
    612698                basic_machine=i586-pc
    613699                ;;
    614         pentiumpro | p6 | 6x86)
     700        pentiumpro | p6 | 6x86 | athlon)
    615701                basic_machine=i686-pc
    616702                ;;
    617703        pentiumii | pentium2)
    618                 basic_machine=i786-pc
     704                basic_machine=i686-pc
    619705                ;;
    620         pentium-* | p5-* | k5-* | k6-* | nexen-*)
     706        pentium-* | p5-* | k5-* | k6-* | nexgen-*)
    621707                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
    622708                ;;
    623         pentiumpro-* | p6-* | 6x86-*)
     709        pentiumpro-* | p6-* | 6x86-* | athlon-*)
    624710                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
    625711                ;;
    626712        pentiumii-* | pentium2-*)
    627                 basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
     713                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
    628714                ;;
    629715        pn)
    630716                basic_machine=pn-gould
    631717                ;;
    632         power)  basic_machine=rs6000-ibm
     718        power)  basic_machine=power-ibm
    633719                ;;
    634720        ppc)    basic_machine=powerpc-unknown
    635721                ;;
    … …  
    644730        ps2)
    645731                basic_machine=i386-ibm
    646732                ;;
     733        pw32)
     734                basic_machine=i586-unknown
     735                os=-pw32
     736                ;;
    647737        rom68k)
    648738                basic_machine=m68k-rom68k
    649739                os=-coff
    … …  
    723813        sun386 | sun386i | roadrunner)
    724814                basic_machine=i386-sun
    725815                ;;
     816        sv1)
     817                basic_machine=sv1-cray
     818                os=-unicos
     819                ;;
    726820        symmetry)
    727821                basic_machine=i386-sequent
    728822                os=-dynix
    … …  
    731825                basic_machine=t3e-cray
    732826                os=-unicos
    733827                ;;
     828        tic54x | c54x*)
     829                basic_machine=tic54x-unknown
     830                os=-coff
     831                ;;
    734832        tx39)
    735833                basic_machine=mipstx39-unknown
    736834                ;;
    … …  
    826924        vax)
    827925                basic_machine=vax-dec
    828926                ;;
     927        pdp10)
     928                # there are many clones, so DEC is not a safe bet
     929                basic_machine=pdp10-unknown
     930                ;;
    829931        pdp11)
    830932                basic_machine=pdp11-dec
    831933                ;;
    832934        we32k)
    833935                basic_machine=we32k-att
    834936                ;;
    835         sparc | sparcv9)
     937        sh3 | sh4)
     938                basic_machine=sh-unknown
     939                ;;
     940        sparc | sparcv9 | sparcv9b)
    836941                basic_machine=sparc-sun
    837942                ;;
    838943        cydra)
    … …  
    854959                basic_machine=c4x-none
    855960                os=-coff
    856961                ;;
     962        *-unknown)
     963                # Make sure to match an already-canonicalized machine name.
     964                ;;
    857965        *)
    858966                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
    859967                exit 1
    … …  
    9121020              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
    9131021              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    9141022              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
    915               | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
     1023              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
     1024              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
     1025              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
    9161026        # Remember, each alternative MUST END IN *, to match a version number.
    9171027                ;;
     1028        -qnx*)
     1029                case $basic_machine in
     1030                    x86-* | i*86-*)
     1031                        ;;
     1032                    *)
     1033                        os=-nto$os
     1034                        ;;
     1035                esac
     1036                ;;
     1037        -nto*)
     1038                os=-nto-qnx
     1039                ;;
    9181040        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
    9191041              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
    920               | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
     1042              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
    9211043                ;;
    9221044        -mac*)
    9231045                os=`echo $os | sed -e 's|mac|macos|'`
    … …  
    9311053        -sunos6*)
    9321054                os=`echo $os | sed -e 's|sunos6|solaris3|'`
    9331055                ;;
     1056        -opened*)
     1057                os=-openedition
     1058                ;;
     1059        -wince*)
     1060                os=-wince
     1061                ;;
    9341062        -osfrose*)
    9351063                os=-osfrose
    9361064                ;;
    … …  
    9551083        -ns2 )
    9561084                os=-nextstep2
    9571085                ;;
     1086        -nsk*)
     1087                os=-nsk
     1088                ;;
    9581089        # Preserve the version number of sinix5.
    9591090        -sinix5.*)
    9601091                os=`echo $os | sed -e 's|sinix|sysv|'`
    … …  
    9891120        -xenix)
    9901121                os=-xenix
    9911122                ;;
    992         -*mint | -*MiNT)
     1123        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
    9931124                os=-mint
    9941125                ;;
    9951126        -none)
    … …  
    10171148        *-acorn)
    10181149                os=-riscix1.2
    10191150                ;;
    1020         arm*-corel)
     1151        arm*-rebel)
    10211152                os=-linux
    10221153                ;;
    10231154        arm*-semi)
    10241155                os=-aout
    10251156                ;;
     1157        pdp10-*)
     1158                os=-tops20
     1159                ;;
    10261160        pdp11-*)
    10271161                os=-none
    10281162                ;;
    … …  
    11311265        *-masscomp)
    11321266                os=-rtu
    11331267                ;;
    1134         f301-fujitsu)
     1268        f30[01]-fujitsu | f700-fujitsu)
    11351269                os=-uxpv
    11361270                ;;
    11371271        *-rom68k)
    … …  
    11911325                        -genix*)
    11921326                                vendor=ns
    11931327                                ;;
    1194                         -mvs*)
     1328                        -mvs* | -opened*)
    11951329                                vendor=ibm
    11961330                                ;;
    11971331                        -ptx*)
    … …  
    12091343                        -mpw* | -macos*)
    12101344                                vendor=apple
    12111345                                ;;
    1212                         -*mint | -*MiNT)
     1346                        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
    12131347                                vendor=atari
    12141348                                ;;
    12151349                esac
    … …  
    12181352esac
    12191353
    12201354echo $basic_machine$os
     1355exit 0
     1356
     1357# Local variables:
     1358# eval: (add-hook 'write-file-hooks 'time-stamp)
     1359# time-stamp-start: "timestamp='"
     1360# time-stamp-format: "%:y-%02m-%02d"
     1361# time-stamp-end: "'"
     1362# End:

  • configure.in 

    Only in patch-2.5.4: configure
diff -urbB patch-2.5.4.0/configure.in patch-2.5.4/configure.in
    old new  
    2727AC_MINIX
    2828AC_ISC_POSIX
    2929AC_EXEEXT
     30AC_OBJEXT
    3031
    3132AM_C_PROTOTYPES
    3233AC_C_CONST

  • Makefile.in 

    Only in patch-2.5.4.0: configure0
Only in patch-2.5.4: diff-patches
Only in patch-2.5.4.0: error.h
Only in patch-2.5.4: error.h0
Only in patch-2.5.4/m4: .svn
Only in patch-2.5.4: Makefile
diff -urbB patch-2.5.4.0/Makefile.in patch-2.5.4/Makefile.in
    old new  
    1818
    1919#### Start of system configuration section. ####
    2020
     21SHELL = /bin/sh
     22
    2123srcdir = @srcdir@
    2224VPATH = @srcdir@
    2325
    … …  
    4042PACKAGE = @PACKAGE@
    4143U = @U@
    4244VERSION = @VERSION@
     45OBJEXT = @OBJEXT@
    4346
    4447prefix = @prefix@
    4548exec_prefix = @exec_prefix@
    … …  
    6366SRCS = addext.c argmatch.c backupfile.c basename.c error.c inp.c maketime.c \
    6467        mkdir.c partime.c patch.c pch.c quotearg.c quotesys.c \
    6568        rmdir.c util.c version.c xmalloc.c $(LIBSRCS)
    66 OBJS = addext$U.o argmatch$U.o backupfile$U.o basename$U.o error$U.o inp$U.o \
    67         maketime.o partime.o patch$U.o pch$U.o quotearg$U.o quotesys.o \
    68         util$U.o version$U.o xmalloc$U.o $(LIBOBJS)
     69OBJS = addext$U.$(OBJEXT) argmatch$U.$(OBJEXT) backupfile$U.$(OBJEXT) basename$U.$(OBJEXT) error$U.$(OBJEXT) inp$U.$(OBJEXT) \
     70        maketime.$(OBJEXT) partime.$(OBJEXT) patch$U.$(OBJEXT) pch$U.$(OBJEXT) quotearg$U.$(OBJEXT) quotesys.$(OBJEXT) \
     71        util$U.$(OBJEXT) version$U.$(OBJEXT) xmalloc$U.$(OBJEXT) $(LIBOBJS)
    6972HDRS = argmatch.h backupfile.h basename.h common.h error.h getopt.h \
    7073        inp.h maketime.h partime.h patchlevel.h pch.h quotearg.h quotesys.h \
    7174        util.h version.h xalloc.h
    … …  
    9093COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
    9194        -I. -I$(srcdir) $(CFLAGS)
    9295
    93 .c.o:
     96.c.$(OBJEXT):
    9497        $(COMPILE) $<
    9598
    9699patch$(EXEEXT): $(OBJS)
    … …  
    134137        etags $(HDRS) patchlevel.h $(SRCS)
    135138
    136139mostlyclean::
    137         rm -f ansi2knr core* *core *.o *_.c
     140        rm -f ansi2knr core* *core *.$(OBJEXT) *_.c
    138141
    139142clean:: mostlyclean
    140143        rm -f patch$(EXEEXT)
    … …  
    160163        tar -chf - $(PV) | gzip -9 >$(PV).tar.gz
    161164        rm -rf $(PV)
    162165
    163 ansi2knr.o: config.h
    164 ansi2knr: ansi2knr.o
    165         $(CC) -o $@ $(CFLAGS) $(LDFLAGS) ansi2knr.o $(LIBS)
     166ansi2knr.$(OBJEXT): config.h
     167ansi2knr: ansi2knr.$(OBJEXT)
     168        $(CC) -o $@ $(CFLAGS) $(LDFLAGS) ansi2knr.$(OBJEXT) $(LIBS)
    166169addext_.c argmatch_.c backupfile_.c basename_.c error_.c \
    167170getopt_.c getopt1_.c inp_.c malloc_.c mkdir_.c patch_.c pch_.c quotearg_.c \
    168171rename_.c util_.c version_.c xmalloc_.c: ansi2knr
    … …  
    171174        ./ansi2knr $< $@
    172175
    173176$(OBJS): config.h
    174 addext$U.o: backupfile.h
    175 argmatch$U.o: argmatch.h error.h quotearg.h
    176 backupfile$U.o: argmatch.h backupfile.h
    177 error$U.o: error.h
    178 getopt$U.o getopt1$U.o: getopt.h
    179 inp$U.o: backupfile.h common.h inp.h pch.h quotearg.h util.h xalloc.h
    180 maketime.o: maketime.h partime.h
    181 partime.o: partime.h
    182 patch$U.o: argmatch.h backupfile.h common.h getopt.h inp.h \
     177addext$U.$(OBJEXT): backupfile.h
     178argmatch$U.$(OBJEXT): argmatch.h error.h quotearg.h
     179backupfile$U.$(OBJEXT): argmatch.h backupfile.h
     180error$U.$(OBJEXT): error.h
     181getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT): getopt.h
     182inp$U.$(OBJEXT): backupfile.h common.h inp.h pch.h quotearg.h util.h xalloc.h
     183maketime.$(OBJEXT): maketime.h partime.h
     184partime.$(OBJEXT): partime.h
     185patch$U.$(OBJEXT): argmatch.h backupfile.h common.h getopt.h inp.h \
    183186        pch.h quotearg.h util.h version.h xalloc.h
    184 pch$U.o: backupfile.h basename.h common.h inp.h pch.h quotearg.h util.h
    185 quotearg$U.o: quotearg.h xalloc.h
    186 quotesys.o: quotesys.h
    187 util$U.o: backupfile.h basename.h common.h maketime.h \
     187pch$U.$(OBJEXT): backupfile.h basename.h common.h inp.h pch.h quotearg.h util.h
     188quotearg$U.$(OBJEXT): quotearg.h xalloc.h
     189quotesys.$(OBJEXT): quotesys.h
     190util$U.$(OBJEXT): backupfile.h basename.h common.h maketime.h \
    188191        partime.h quotearg.h quotesys.h util.h version.h xalloc.h
    189 version$U.o: common.h patchlevel.h util.h version.h
    190 xmalloc$U.o: xalloc.h
     192version$U.$(OBJEXT): common.h patchlevel.h util.h version.h
     193xmalloc$U.$(OBJEXT): xalloc.h

  • patch-2.5.4 

    diff -urbB patch-2.5.4.0/mkdir.c patch-2.5.4/mkdir.c
    old new  
    7575  if (errno != ENOENT)
    7676    return -1;
    7777
     78#ifndef __EMX__
    7879  cpid = fork ();
     80#else
     81  mode = umask (0);     /* Get current umask.  */
     82  umask (mode | ((S_IRWXU | S_IRWXG | S_IRWXO) & ~dmode));
     83  cpid = spawnl (P_NOWAIT, "mkdir.exe", "mkdir.exe", dpath, (char *) 0);
     84  umask(mode); /* restore umask */
     85#endif
     86
    7987  switch (cpid)
    8088    {
    8189    case -1:                    /* Cannot fork.  */
    8290      return -1;                /* errno is already set.  */
    8391
     92#ifndef __EMX__
    8493    case 0:                     /* Child process.  */
    8594      /* Cheap hack to set mode of new directory.  Since this child
    8695         process is going away anyway, we zap its umask.
    … …  
    91100      umask (mode | ((S_IRWXU | S_IRWXG | S_IRWXO) & ~dmode));
    92101      execl ("/bin/mkdir", "mkdir", dpath, (char *) 0);
    93102      _exit (1);
     103#endif /* NOT __EMX__ */
    94104
    95105    default:                    /* Parent process.  */
    96106      /* Wait for kid to finish.  */

  • mkinstalldirs 

    diff -urbB patch-2.5.4.0/mkinstalldirs patch-2.5.4/mkinstalldirs
    old new  
    44# Created: 1993-05-16
    55# Public domain
    66
    7 # $Id: mkinstalldirs,v 1.12.2.1 1998/12/26 17:32:14 bje Exp $
     7# $Id: mkinstalldirs,v 1.14 1999/04/09 21:44:01 bje Exp $
    88
    99errstatus=0
     10dirmode=""
     11
     12usage="\
     13Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
     14
     15# process command line arguments
     16while test $# -gt 0 ; do
     17   case "${1}" in
     18     -h | --help | --h* )                       # -h for help
     19        echo "${usage}" 1>&2; exit 0 ;;
     20     -m )                                       # -m PERM arg
     21        shift
     22        test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
     23        dirmode="${1}"
     24        shift ;;
     25     -- ) shift; break ;;                       # stop option processing
     26     -* ) echo "${usage}" 1>&2; exit 1 ;;       # unknown option
     27     * )  break ;;                              # first non-opt arg
     28   esac
     29done
    1030
    1131for file
    1232do
    … …  
    2141       -* ) pathcomp=./$pathcomp ;;
    2242     esac
    2343
    24      if test ! -d "$pathcomp"; then
     44     if test ! -d "$pathcomp" -a ! -d "$pathcomp/"; then
    2545        echo "mkdir $pathcomp"
    2646
    2747        mkdir "$pathcomp" || lasterr=$?
    2848
    29         if test ! -d "$pathcomp"; then
     49        if test ! -d "$pathcomp" -a ! -d "$pathcomp/"; then
    3050          errstatus=$lasterr
     51        else
     52          if test ! -z "$dirmode"; then
     53             echo "chmod $dirmode $pathcomp"
     54
     55             lasterr=""
     56             chmod $dirmode "$pathcomp" || lasterr=$?
     57
     58             if test ! -z "$lasterr"; then
     59               errstatus=$lasterr
     60             fi
     61          fi
    3162        fi
    3263     fi
    3364
    … …  
    3768
    3869exit $errstatus
    3970
    40 # mkinstalldirs ends here
     71# Local Variables:
     72# mode:shell-script
     73# sh-indentation:3
     74# End:

  • patch-2.5.4 

    Only in patch-2.5.4/pc: .svn
Only in patch-2.5.4/pc/djgpp: .svn
diff -urbB patch-2.5.4.0/rmdir.c patch-2.5.4/rmdir.c
    old new  
    5757      return -1;
    5858    }
    5959
     60#ifndef __EMX__
     61  cpid = fork ();
     62#else
     63  cpid = spawnl (P_NOWAIT, "rmdir.exe", "rmdir.exe", dpath, (char *) 0);
     64#endif
    6065  cpid = fork ();
    6166  switch (cpid)
    6267    {
    6368    case -1:                    /* cannot fork */
    6469      return -1;                /* errno already set */
    6570
     71#ifndef __EMX__
    6672    case 0:                     /* child process */
    6773      execl ("/bin/rmdir", "rmdir", dpath, (char *) 0);
    6874      _exit (1);
     75#endif
    6976
    7077    default:                    /* parent process */
    7178

  • patch-2.5.4 

    diff -urbB patch-2.5.4.0/util.c patch-2.5.4/util.c
    old new  
    133133          if (debug & 4)
    134134            say ("Renaming file %s to %s\n",
    135135                 quotearg_n (0, to), quotearg_n (1, bakname));
     136#ifdef __EMX__
     137          /* under OS/2 rename() fails if the target file exists */
     138          if (access(bakname, R_OK) == 0) unlink(bakname);
     139#endif /* __EMX__ */
    136140          while (rename (to, bakname) != 0)
    137141            {
    138142              if (errno != try_makedirs_errno)
    … …  
    151155      if (debug & 4)
    152156        say ("Renaming file %s to %s\n",
    153157             quotearg_n (0, from), quotearg_n (1, to));
    154 
     158#ifdef __EMX__
     159        /* under OS/2 rename() fails if the target file exists */
     160        if (access(to, R_OK) == 0) unlink(to);
     161#endif /* __EMX__ */
    155162      if (rename (from, to) == 0)
    156163        *from_needs_removal = 0;
    157164      else