From 2ad4b7ff2af736e7a1344639a385377b3d5ef96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 8 May 2019 16:35:20 +0200 Subject: [PATCH 1/3] Add man-pages for fstransform et all. --- man/fsattr.8 | 27 +++++++++ man/fsmount_kernel.8 | 26 +++++++++ man/fsmove.8 | 64 +++++++++++++++++++++ man/fsremap.8 | 129 +++++++++++++++++++++++++++++++++++++++++++ man/fstransform.8 | 74 +++++++++++++++++++++++++ 5 files changed, 320 insertions(+) create mode 100644 man/fsattr.8 create mode 100644 man/fsmount_kernel.8 create mode 100644 man/fsmove.8 create mode 100644 man/fsremap.8 create mode 100644 man/fstransform.8 diff --git a/man/fsattr.8 b/man/fsattr.8 new file mode 100644 index 0000000..66c9ed5 --- /dev/null +++ b/man/fsattr.8 @@ -0,0 +1,27 @@ +.TH FSATTR "8" "" "fsattr" "System Administration Utilities" +.SH NAME +fsattr \- manual page for fsattr +.SH SYNOPSIS +.B fsattr +\fI\,--files={normal|prealloc} DEVICE\/\fR +.SH DESCRIPTION +Modify file\-system internal data structures +Options: +.TP +\fB\-\-\fR +end of options. treat subsequent parameters as arguments +even if they start with '\-' +.TP +\fB\-\-files\fR=\fI\,normal\/\fR +set files to normal mode, i.e. show their contents. +.HP +\fB\-\-files\fR=\fI\,prealloc\/\fR set files to 'preallocated', i.e. clear their contents. +.TP +\fB\-\-fstype\fR=\fI\,FSTYPE\/\fR +specify file system inside device. +.TP +\fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit diff --git a/man/fsmount_kernel.8 b/man/fsmount_kernel.8 new file mode 100644 index 0000000..f035780 --- /dev/null +++ b/man/fsmount_kernel.8 @@ -0,0 +1,26 @@ +.TH FSMOUNT_KERNEL "8" "" "fsmount_kernel" "System Administration Utilities" +.SH NAME +fsmount_kernel \- manual page for fsmount_kernel +.SH SYNOPSIS +.B fsmount_kernel +[\fI\,-o OPTIONS\/\fR] \fI\,-t FILESYSTEM_TYPE SOURCE TARGET\/\fR +.SH DESCRIPTION +Call the kernel to mount a filesystem, +ignoring any userspace helper or wrapper (fuse...) +Options: +.TP +\fB\-\-\fR +end of options. treat subsequent parameters as arguments +even if they start with '\-' +.TP +\fB\-t\fR +set the filesystem type. MANDATORY. +.TP +\fB\-o\fR +comma\-separated list of mount options. +.TP +\fB\-h\fR, \fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit diff --git a/man/fsmove.8 b/man/fsmove.8 new file mode 100644 index 0000000..d9846ae --- /dev/null +++ b/man/fsmove.8 @@ -0,0 +1,64 @@ +.TH FSMOVE "8" "" "fsmove" "System Administration Utilities" +.SH NAME +fsmove \- manual page for fsmove +.SH SYNOPSIS +.B fsmove +[\fI\,OPTION\/\fR]... \fI\,SOURCE TARGET \/\fR[\fI\,--exclude FILE\/\fR...] +.SH DESCRIPTION +Recursively move files and folders from SOURCE to TARGET, +even if SOURCE and TARGET are almost full or share their free space +(for example if TARGET is a file system inside a loop\-file _inside_ SOURCE) +.PP +Mandatory arguments to long options are mandatory for short options too. +.TP +\fB\-\-\fR +end of options. treat subsequent parameters as arguments +even if they start with '\-' +.TP +\fB\-e\fR, \fB\-\-exclude\fR FILE... skip these files, i.e. do not move them. +must be last argument +.TP +\fB\-f\fR, \fB\-\-force\-run\fR +run even if some safety checks fail +.TP +\fB\-\-io\fR=\fI\,posix\/\fR +use POSIX I/O and move files (default) +.TP +\fB\-\-io\fR=\fI\,prealloc\/\fR +use POSIX I/O and preallocate files (do NOT move them) +.HP +\fB\-\-inode\-cache\-mem\fR use in\-memory inode cache (default) +.HP +\fB\-\-inode\-cache\fR=\fI\,DIR\/\fR create and use directory DIR for inode cache +.TP +\fB\-\-log\-color\fR=\fI\,MODE\/\fR +set messages color. MODE is one of: auto (default), none, ansi +.TP +\fB\-\-log\-format\fR=\fI\,FMT\/\fR +set messages format. FMT is one of: +msg (default), level_msg, time_level_msg, +time_level_function_msg +.TP +\fB\-n\fR, \fB\-\-no\-action\fR, \fB\-\-simulate\-run\fR +do not actually move any file or directory +.TP +\fB\-q\fR, \fB\-\-quiet\fR +be quiet +.TP +\fB\-qq\fR +be very quiet, only print warnings or errors +.TP +\fB\-v\fR, \fB\-\-verbose\fR +be verbose, print what is being done +.TP +\fB\-vv\fR +be very verbose, print a lot of detailed output +.TP +\fB\-vvv\fR +be incredibly verbose (warning: prints LOTS of output) +.TP +\fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit diff --git a/man/fsremap.8 b/man/fsremap.8 new file mode 100644 index 0000000..2f71f21 --- /dev/null +++ b/man/fsremap.8 @@ -0,0 +1,129 @@ +.TH FSREMAP "8" "" "fsremap" "System Administration Utilities" +.SH NAME +fsremap \- manual page for fsremap +.SH SYNOPSIS +.B fsremap +[\fI\,OPTION\/\fR]... \fI\,DEVICE LOOP-FILE \/\fR[\fI\,ZERO-FILE\/\fR] +.br +.B fsremap +[\fI\,OPTION\/\fR]... \fI\,--resume-job=JOB_ID DEVICE\/\fR +.SH DESCRIPTION +Replace the contents of DEVICE with the contents of LOOP\-FILE, i.e. write LOOP\-FILE onto DEVICE +even if LOOP\-FILE is inside a file system _inside_ DEVICE +.PP +Mandatory arguments to long options are mandatory for short options too. +.TP +\fB\-\-\fR +end of options. treat subsequent parameters as arguments +even if they start with '\-' +.TP +\fB\-a\fR, \fB\-\-no\-questions\fR +automatic run: do not ask any question +.TP +\fB\-\-clear\fR=\fI\,all\/\fR +clear all free blocks after remapping (default) +.TP +\fB\-\-clear\fR=\fI\,minimal\/\fR +(DANGEROUS) clear only overwritten free blocks +after remapping +.TP +\fB\-\-clear\fR=\fI\,none\/\fR +(DANGEROUS) do not clear any free blocks after remapping +.TP +\fB\-\-cmd\-umount\fR=\fI\,CMD\/\fR +command to unmount DEVICE (default: \fI\,/bin/umount\/\fP) +.HP +\fB\-\-cmd\-losetup\fR=\fI\,CMD\/\fR 'losetup' command (default: \fI\,/sbin/losetup\/\fP) +.TP +\fB\-\-color\fR=\fI\,MODE\/\fR +set messages color. MODE is one of: +auto (default), none, ansi +.TP +\fB\-\-device\-mount\-point\fR=\fI\,DIR\/\fR +set device mount point (needed by \fB\-\-io\fR=\fI\,prealloc\/\fR) +.TP +\fB\-f\fR, \fB\-\-force\-run\fR +continue even if some sanity checks fail +.TP +\fB\-i\fR, \fB\-\-interactive\fR +ask confirmation after analysis, before actual work +.TP +\fB\-\-io\fR=\fI\,posix\/\fR +use posix I/O (default) +.TP +\fB\-\-io\fR=\fI\,prealloc\/\fR +use posix I/O with EXPERIMENTAL preallocated files +.TP +\fB\-\-io\fR=\fI\,self\-test\/\fR +perform in\-memory self\-test with random data +.TP +\fB\-\-io\fR=\fI\,test\/\fR +use test I/O. Arguments are: +DEVICE\-LENGTH LOOP\-FILE\-EXTENTS FREE\-SPACE\-EXTENTS +.TP +\fB\-\-loop\-device\fR=\fI\,LOOP\-DEVICE\/\fR +loop device to disconnect (needed by \fB\-\-io\fR=\fI\,prealloc\/\fR) +.TP +\fB\-\-loop\-mount\-point\fR=\fI\,DIR\/\fR +set loop file mount point (needed by \fB\-\-io\fR=\fI\,prealloc\/\fR) +.TP +\fB\-m\fR, \fB\-\-mem\-buffer\fR=\fI\,RAM_SIZE[k\/\fR|M|G|T|P|E|Z|Y] +set RAM buffer size (default: autodetect) +.TP +\fB\-n\fR, \fB\-\-no\-action\fR, \fB\-\-simulate\-run\fR +do not actually read or write any disk block +.TP +\fB\-\-questions\fR=\fI\,MODE\/\fR +set interactive mode. MODE is one of: +no: never ask questions, abort on errors (default) +yes: ask questions in case of user\-fixable errors +extra: also ask confirmation before dangerous steps +.TP +\fB\-q\fR, \fB\-\-quiet\fR +be quiet, print less output +.TP +\fB\-qq\fR +be very quiet, only print warnings or errors +.TP +\fB\-\-resume\-job\fR=\fI\,NUM\/\fR +resume the interrupted job NUM. The only non\-option +argument must be DEVICE. Do _not_ pass LOOP\-FILE +as argument, or you will LOSE YOUR DATA! +.TP +\fB\-s\fR, \fB\-\-secondary\-storage\fR=\fI\,SECONDARY_SIZE[k\/\fR|M|G|T|P|E|Z|Y] +set secondary storage file length (default: autodetect) +.TP +\fB\-t\fR, \fB\-\-temp\-dir\fR=\fI\,DIR\/\fR +write storage and log files inside DIR +(default: \fI\,/var/tmp/fstransform\/\fP) +.TP +\fB\-\-ui\-tty\fR=\fI\,TTY\/\fR +show full\-text progress on tty device TTY +.TP +\fB\-v\fR, \fB\-\-verbose\fR +be verbose +.TP +\fB\-vv\fR +be very verbose +.TP +\fB\-vvv\fR +be incredibly verbose (warning: prints lots of output) +.TP +\fB\-xp\fR, \fB\-\-exact\-primary\-storage\fR=\fI\,PRIMARY_SIZE[k\/\fR|M|G|T|P|E|Z|Y] +set _exact_ primary storage length, or fail +.IP +(default: autodetect) +.TP +\fB\-xs\fR, \fB\-\-exact\-secondary\-storage\fR=\fI\,SECONDARY_SIZE[k\/\fR|M|G|T|P|E|Z|Y] +set _exact_ secondary storage length, or fail +.IP +(default: autodetect) +.TP +\fB\-\-x\-OPTION\fR=\fI\,VALUE\/\fR +set internal, undocumented option. for maintainers only +.TP +\fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit diff --git a/man/fstransform.8 b/man/fstransform.8 new file mode 100644 index 0000000..0e1164b --- /dev/null +++ b/man/fstransform.8 @@ -0,0 +1,74 @@ +.TH FSTRANSFORM "8" "" "fstransform" "System Administration Utilities" +.SH NAME +fstransform \- manual page for fstransform +.SH SYNOPSIS +.B fstransform +[\fI\,OPTION\/\fR]... \fI\,DEVICE NEW-FILE-SYSTEM-TYPE\/\fR +.SH DESCRIPTION +Transform file system inside DEVICE to NEW\-FILE\-SYSTEM\-TYPE, +preserving its contents and without need for backup +.SH OPTIONS +.TP +\fB\-\-cmd\-CMD\-NAME\fR=\fI\,CMD\-PATH\/\fR +set external command CMD\-NAME to use. +default: autodetect +.HP +\fB\-\-force\-untested\-file\-systems\fR also transform untested file systems (DANGEROUS) +.TP +\fB\-\-list\-source\-file\-systems\fR +list file systems supported as source and exit +.TP +\fB\-\-list\-target\-file\-systems\fR +list file systems supported as target and exit +.TP +\fB\-\-loop\-file\fR=\fI\,LOOP\-FILE\/\fR +override loop\-file path +.TP +\fB\-\-loop\-mount\-point\fR=\fI\,PATH\/\fR +override loop\-file mount point +.TP +\fB\-\-new\-size\fR=\fI\,SIZE\/\fR +set new file system length. default: device length +.TP +\fB\-\-current\-fstype\fR=\fI\,OLD\-TYPE\/\fR +override current (old) file system type autodetection +required for 'ntfs' file system +.TP +\fB\-\-opts\-fsmove\fR=\fI\,OPTS\/\fR +pass OPTS as additional options to 'fsmove' +.TP +\fB\-\-opts\-fsremap\fR=\fI\,OPTS\/\fR +pass OPTS as additional options to 'fsremap' +.TP +\fB\-\-opts\-mkfs\fR=\fI\,OPTS\/\fR +pass OPTS as options to 'mkfs'. default: '\-q' +.TP +\fB\-\-opts\-fsck\-source\fR=\fI\,OPTS\/\fR +override 'fsck' options for old file system. default: '\-p \fB\-f\fR' +.TP +\fB\-\-opts\-fsck\-target\fR=\fI\,OPTS\/\fR +override 'fsck' options for new file system. default: '\-p \fB\-f\fR' +.TP +\fB\-\-show\-time[\fR=\fI\,yes\/\fR|=no] +show current time before each message. default: yes +.TP +\fB\-\-prealloc[\fR=\fI\,yes\/\fR|no] +use EXPERIMENTAL files preallocation. default: no +.HP +\fB\-\-questions\fR=\fI\,[yes\/\fR|no|on\-error] whether to ask questions interactively. default: on\-error +.TP +\fB\-\-reversible[\fR=\fI\,yes\/\fR|no] +create zero\-file, fsremap will do a reversible transformation +default: no +.TP +\fB\-\-x\-OPTION\fR=\fI\,VALUE\/\fR +set internal, undocumented option. For maintainers only. +.TP +\fB\-\-zero\-file\fR=\fI\,ZERO\-FILE\/\fR +override zero\-file path +.TP +\fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit From dfc7e487b2c8d6bc45b50f0a26a82a3312e2dc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 8 May 2019 16:36:37 +0200 Subject: [PATCH 2/3] Add Makefile for man-page install. --- Makefile.am | 2 +- configure.ac | 2 +- man/Makefile.am | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 man/Makefile.am diff --git a/Makefile.am b/Makefile.am index 93c0cb2..4750615 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = fsattr/build fsmove/build fsmount_kernel/build fsremap/build fstransform/build +SUBDIRS = fsattr/build fsmove/build fsmount_kernel/build fsremap/build fstransform/build man mrproper-distclean: distclean rm -fr autom4te.cache configure fsremap/src/ft_config.hh diff --git a/configure.ac b/configure.ac index f40088d..b572a6a 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,7 @@ else fi -AC_CONFIG_FILES([Makefile fsattr/build/Makefile fsremap/build/Makefile fsmove/build/Makefile fsmount_kernel/build/Makefile fstransform/build/Makefile]) +AC_CONFIG_FILES([Makefile fsattr/build/Makefile fsremap/build/Makefile fsmove/build/Makefile fsmount_kernel/build/Makefile fstransform/build/Makefile man/Makefile]) AC_OUTPUT FT_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..36b7ad1 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,6 @@ +notrans_dist_man8_MANS = \ + fsattr.8 \ + fsmount_kernel.8 \ + fsmove.8 \ + fsremap.8 \ + fstransform.8 From 9003a81d14ac4b3caf408eb472824f15c59669a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 8 May 2019 16:39:02 +0200 Subject: [PATCH 3/3] Regenerate autotools. --- Makefile.in | 3 +- configure | 19 +- fsattr/build/Makefile.in | 1 - fsmount_kernel/build/Makefile.in | 1 - fsmove/build/Makefile.in | 1 - fsremap/build/Makefile.in | 1 - fstransform/build/Makefile.in | 1 - man/Makefile.in | 488 +++++++++++++++++++++++++++++++ tools/depcomp | 10 +- tools/install-sh | 47 ++- tools/missing | 16 +- 11 files changed, 537 insertions(+), 51 deletions(-) create mode 100644 man/Makefile.in diff --git a/Makefile.in b/Makefile.in index ff066e3..fd45182 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,7 +288,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -297,7 +296,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = fsattr/build fsmove/build fsmount_kernel/build fsremap/build fstransform/build +SUBDIRS = fsattr/build fsmove/build fsmount_kernel/build fsremap/build fstransform/build man all: all-recursive .SUFFIXES: diff --git a/configure b/configure index 3a5f55f..9ed8bfa 100755 --- a/configure +++ b/configure @@ -694,7 +694,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -769,7 +768,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1022,15 +1020,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1168,7 +1157,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1321,7 +1310,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -5107,8 +5095,6 @@ main () if (*(data + i) != *(data3 + i)) return 14; close (fd); - free (data); - free (data3); return 0; } _ACEOF @@ -5394,7 +5380,7 @@ $as_echo "$as_me: support for experimental files preallocation will be compiled" fi -ac_config_files="$ac_config_files Makefile fsattr/build/Makefile fsremap/build/Makefile fsmove/build/Makefile fsmount_kernel/build/Makefile fstransform/build/Makefile" +ac_config_files="$ac_config_files Makefile fsattr/build/Makefile fsremap/build/Makefile fsmove/build/Makefile fsmount_kernel/build/Makefile fstransform/build/Makefile man/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -6129,6 +6115,7 @@ do "fsmove/build/Makefile") CONFIG_FILES="$CONFIG_FILES fsmove/build/Makefile" ;; "fsmount_kernel/build/Makefile") CONFIG_FILES="$CONFIG_FILES fsmount_kernel/build/Makefile" ;; "fstransform/build/Makefile") CONFIG_FILES="$CONFIG_FILES fstransform/build/Makefile" ;; + "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/fsattr/build/Makefile.in b/fsattr/build/Makefile.in index 1e58fa4..6e7ab5f 100644 --- a/fsattr/build/Makefile.in +++ b/fsattr/build/Makefile.in @@ -251,7 +251,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/fsmount_kernel/build/Makefile.in b/fsmount_kernel/build/Makefile.in index 43e306a..738239d 100644 --- a/fsmount_kernel/build/Makefile.in +++ b/fsmount_kernel/build/Makefile.in @@ -250,7 +250,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/fsmove/build/Makefile.in b/fsmove/build/Makefile.in index 0a66e52..b132923 100644 --- a/fsmove/build/Makefile.in +++ b/fsmove/build/Makefile.in @@ -277,7 +277,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/fsremap/build/Makefile.in b/fsremap/build/Makefile.in index 3f3b51e..aac772b 100644 --- a/fsremap/build/Makefile.in +++ b/fsremap/build/Makefile.in @@ -286,7 +286,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/fstransform/build/Makefile.in b/fstransform/build/Makefile.in index 3f79ca0..a8c7bab 100644 --- a/fstransform/build/Makefile.in +++ b/fstransform/build/Makefile.in @@ -234,7 +234,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/man/Makefile.in b/man/Makefile.in new file mode 100644 index 0000000..581cde0 --- /dev/null +++ b/man/Makefile.in @@ -0,0 +1,488 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = man +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/tools/ft_cxx_flags.m4 \ + $(top_srcdir)/tools/ft_cxx_features.m4 \ + $(top_srcdir)/tools/ft_cxx_unordered_map.m4 \ + $(top_srcdir)/tools/ft_need_funcs.m4 \ + $(top_srcdir)/tools/ft_need_libs.m4 \ + $(top_srcdir)/tools/ft_output.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/fsremap/src/config.hh +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +man8dir = $(mandir)/man8 +am__installdirs = "$(DESTDIR)$(man8dir)" +NROFF = nroff +MANS = $(notrans_dist_man8_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(notrans_dist_man8_MANS) $(srcdir)/Makefile.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LD_LIBCOM_ERR = @LD_LIBCOM_ERR@ +LD_LIBEXT2FS = @LD_LIBEXT2FS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CXX = @ac_ct_CXX@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +notrans_dist_man8_MANS = \ + fsattr.8 \ + fsmount_kernel.8 \ + fsmove.8 \ + fsremap.8 \ + fstransform.8 + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-man8: $(notrans_dist_man8_MANS) + @$(NORMAL_INSTALL) + @list1='$(notrans_dist_man8_MANS)'; \ + list2=''; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed 'n;s,.*/,,;p;s,\.[^8][0-9a-z]*$$,.8,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ + done; } + +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(notrans_dist_man8_MANS)'; test -n "$(man8dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + } | sed 's,.*/,,;s,\.[^8][0-9a-z]*$$,.8,'`; \ + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-man + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: install-man8 + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-man + +uninstall-man: uninstall-man8 + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man8 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man8 + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tools/depcomp b/tools/depcomp index fc98710..65cbf70 100755 --- a/tools/depcomp +++ b/tools/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,9 +783,9 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/tools/install-sh b/tools/install-sh index 0b0fdcb..8175c64 100755 --- a/tools/install-sh +++ b/tools/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ do fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,8 +444,8 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -493,9 +510,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/tools/missing b/tools/missing index f62bbae..625aeb1 100755 --- a/tools/missing +++ b/tools/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ else exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: