tar: update ancient configure cruft
* configure.ac: Use AC_PROG_CC_STDC, not just AC_PROG_CC. Remove obsolete macros AC_ISC_POSIX, AC_HEADER_SYS_WAIT, AC_HEADER_DIRENT, AC_HEADER_STAT, AC_HEADER_STDC, AC_TYPE_SIGNAL, AC_TYPE_SIZE_T. * lib/prepargs.c (IN_CTYPE_DOMAIN): Remove. All uses removed. * src/list.c (from_header): Use isspace, not ISSPACE. * src/system.c (pipe_handler, sys_exec_info_script): * src/tar.c (sigstat): Use void, not RETSIGTYPE.
This commit is contained in:
10
configure.ac
10
configure.ac
@@ -27,14 +27,13 @@ AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz dist-shar std-options
|
|||||||
# Enable silent rules by default:
|
# Enable silent rules by default:
|
||||||
AM_SILENT_RULES([yes])
|
AM_SILENT_RULES([yes])
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC_STDC
|
||||||
AC_EXEEXT
|
AC_EXEEXT
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_PROG_YACC
|
AC_PROG_YACC
|
||||||
gl_EARLY
|
gl_EARLY
|
||||||
|
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
AC_ISC_POSIX
|
|
||||||
AC_C_INLINE
|
AC_C_INLINE
|
||||||
|
|
||||||
AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h memory.h net/errno.h \
|
AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h memory.h net/errno.h \
|
||||||
@@ -49,12 +48,7 @@ AC_CHECK_HEADERS([sys/buf.h], [], [],
|
|||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#endif])
|
#endif])
|
||||||
|
|
||||||
AC_HEADER_SYS_WAIT
|
|
||||||
|
|
||||||
AC_HEADER_DIRENT
|
|
||||||
AC_HEADER_MAJOR
|
AC_HEADER_MAJOR
|
||||||
AC_HEADER_STAT
|
|
||||||
AC_HEADER_STDC
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for st_fstype string in struct stat])
|
AC_MSG_CHECKING([for st_fstype string in struct stat])
|
||||||
AC_CACHE_VAL(diff_cv_st_fstype_string,
|
AC_CACHE_VAL(diff_cv_st_fstype_string,
|
||||||
@@ -91,11 +85,9 @@ else
|
|||||||
export enable_acl=no
|
export enable_acl=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_TYPE_SIGNAL
|
|
||||||
AC_TYPE_MODE_T
|
AC_TYPE_MODE_T
|
||||||
AC_TYPE_PID_T
|
AC_TYPE_PID_T
|
||||||
AC_TYPE_OFF_T
|
AC_TYPE_OFF_T
|
||||||
AC_TYPE_SIZE_T
|
|
||||||
AC_TYPE_UID_T
|
AC_TYPE_UID_T
|
||||||
AC_CHECK_TYPE(major_t, , AC_DEFINE(major_t, int,
|
AC_CHECK_TYPE(major_t, , AC_DEFINE(major_t, int,
|
||||||
[Type of major device numbers.]))
|
[Type of major device numbers.]))
|
||||||
|
|||||||
@@ -29,16 +29,6 @@
|
|||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
/* IN_CTYPE_DOMAIN (C) is nonzero if the unsigned char C can safely be given
|
|
||||||
as an argument to <ctype.h> macros like "isspace". */
|
|
||||||
#ifdef STDC_HEADERS
|
|
||||||
# define IN_CTYPE_DOMAIN(c) 1
|
|
||||||
#else
|
|
||||||
# define IN_CTYPE_DOMAIN(c) ((c) <= 0177)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
|
|
||||||
|
|
||||||
/* Find the white-space-separated options specified by OPTIONS, and
|
/* Find the white-space-separated options specified by OPTIONS, and
|
||||||
using BUF to store copies of these options, set ARGV[0], ARGV[1],
|
using BUF to store copies of these options, set ARGV[0], ARGV[1],
|
||||||
etc. to the option copies. Return the number N of options found.
|
etc. to the option copies. Return the number N of options found.
|
||||||
@@ -53,7 +43,7 @@ prepend_args (char const *options, char *buf, char **argv)
|
|||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
while (ISSPACE ((unsigned char) *o))
|
while (isspace ((unsigned char) *o))
|
||||||
o++;
|
o++;
|
||||||
if (!*o)
|
if (!*o)
|
||||||
return n;
|
return n;
|
||||||
@@ -64,7 +54,7 @@ prepend_args (char const *options, char *buf, char **argv)
|
|||||||
do
|
do
|
||||||
if ((*b++ = *o++) == '\\' && *o)
|
if ((*b++ = *o++) == '\\' && *o)
|
||||||
b[-1] = *o++;
|
b[-1] = *o++;
|
||||||
while (*o && ! ISSPACE ((unsigned char) *o));
|
while (*o && ! isspace ((unsigned char) *o));
|
||||||
|
|
||||||
*b++ = '\0';
|
*b++ = '\0';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -723,7 +723,7 @@ from_header (char const *where0, size_t digs, char const *type,
|
|||||||
type));
|
type));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (!ISSPACE ((unsigned char) *where))
|
if (!isspace ((unsigned char) *where))
|
||||||
break;
|
break;
|
||||||
where++;
|
where++;
|
||||||
}
|
}
|
||||||
@@ -861,7 +861,7 @@ from_header (char const *where0, size_t digs, char const *type,
|
|||||||
value = -value;
|
value = -value;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (where != lim && *where && !ISSPACE ((unsigned char) *where))
|
if (where != lim && *where && !isspace ((unsigned char) *where))
|
||||||
{
|
{
|
||||||
if (type)
|
if (type)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -720,7 +720,7 @@ stat_to_env (char *name, char type, struct tar_stat_info *st)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static pid_t global_pid;
|
static pid_t global_pid;
|
||||||
static RETSIGTYPE (*pipe_handler) (int sig);
|
static void (*pipe_handler) (int sig);
|
||||||
|
|
||||||
int
|
int
|
||||||
sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st)
|
sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st)
|
||||||
@@ -788,7 +788,7 @@ sys_exec_info_script (const char **archive_name, int volume_number)
|
|||||||
pid_t pid;
|
pid_t pid;
|
||||||
char uintbuf[UINTMAX_STRSIZE_BOUND];
|
char uintbuf[UINTMAX_STRSIZE_BOUND];
|
||||||
int p[2];
|
int p[2];
|
||||||
static RETSIGTYPE (*saved_handler) (int sig);
|
static void (*saved_handler) (int sig);
|
||||||
|
|
||||||
xpipe (p);
|
xpipe (p);
|
||||||
saved_handler = signal (SIGPIPE, SIG_IGN);
|
saved_handler = signal (SIGPIPE, SIG_IGN);
|
||||||
|
|||||||
@@ -990,7 +990,7 @@ set_use_compress_program_option (const char *string)
|
|||||||
use_compress_program_option = string;
|
use_compress_program_option = string;
|
||||||
}
|
}
|
||||||
|
|
||||||
static RETSIGTYPE
|
static void
|
||||||
sigstat (int signo)
|
sigstat (int signo)
|
||||||
{
|
{
|
||||||
compute_duration ();
|
compute_duration ();
|
||||||
@@ -1775,7 +1775,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
|
|||||||
case KEEP_DIRECTORY_SYMLINK_OPTION:
|
case KEEP_DIRECTORY_SYMLINK_OPTION:
|
||||||
keep_directory_symlink_option = true;
|
keep_directory_symlink_option = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case KEEP_NEWER_FILES_OPTION:
|
case KEEP_NEWER_FILES_OPTION:
|
||||||
old_files_option = KEEP_NEWER_FILES;
|
old_files_option = KEEP_NEWER_FILES;
|
||||||
break;
|
break;
|
||||||
@@ -2220,7 +2220,7 @@ static int subcommand_class[] = {
|
|||||||
|
|
||||||
/* Return t if the subcommand_option is in class(es) f */
|
/* Return t if the subcommand_option is in class(es) f */
|
||||||
#define IS_SUBCOMMAND_CLASS(f) (subcommand_class[subcommand_option] & (f))
|
#define IS_SUBCOMMAND_CLASS(f) (subcommand_class[subcommand_option] & (f))
|
||||||
|
|
||||||
static struct tar_args args;
|
static struct tar_args args;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -2493,7 +2493,7 @@ decode_options (int argc, char **argv)
|
|||||||
_("--%s option cannot be used with %s"),
|
_("--%s option cannot be used with %s"),
|
||||||
starting_file_option ? "starting-file" : "same-order",
|
starting_file_option ? "starting-file" : "same-order",
|
||||||
subcommand_string (subcommand_option)));
|
subcommand_string (subcommand_option)));
|
||||||
|
|
||||||
/* If ready to unlink hierarchies, so we are for simpler files. */
|
/* If ready to unlink hierarchies, so we are for simpler files. */
|
||||||
if (recursive_unlink_option)
|
if (recursive_unlink_option)
|
||||||
old_files_option = UNLINK_FIRST_OLD_FILES;
|
old_files_option = UNLINK_FIRST_OLD_FILES;
|
||||||
|
|||||||
Reference in New Issue
Block a user