diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | misc-utils/Makemodule.am | 12 | ||||
-rw-r--r-- | misc-utils/hardlink.1 | 62 | ||||
-rw-r--r-- | misc-utils/hardlink.c | 534 | ||||
-rw-r--r-- | tests/commands.sh | 1 | ||||
-rw-r--r-- | tests/expected/hardlink/options-content | 26 | ||||
-rw-r--r-- | tests/expected/hardlink/options-dryrun | 34 | ||||
-rw-r--r-- | tests/expected/hardlink/options-nargs | 34 | ||||
-rw-r--r-- | tests/expected/hardlink/options-noregex | 1 | ||||
-rw-r--r-- | tests/expected/hardlink/options-orig | 26 | ||||
-rw-r--r-- | tests/expected/hardlink/options-regex-escapes | 26 | ||||
-rwxr-xr-x | tests/ts/hardlink/options | 78 | ||||
-rw-r--r-- | tests/ts/hardlink/testdir1.tar.xz | bin | 0 -> 26468 bytes |
14 files changed, 847 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9f2fb17db..b582a8627 100644 --- a/.gitignore +++ b/.gitignore @@ -96,6 +96,7 @@ ylwrap /fsfreeze /fstrim /getopt +/hardlink /hexdump /hwclock /ionice diff --git a/configure.ac b/configure.ac index 4c28ccc7a..bbf07db3f 100644 --- a/configure.ac +++ b/configure.ac @@ -1408,6 +1408,18 @@ UL_REQUIRES_HAVE([setpriv], [linux_securebits_h], [securebits.h header file]) UL_REQUIRES_HAVE([setpriv], [cap_ng], [libcap-ng library]) AM_CONDITIONAL([BUILD_SETPRIV], [test "x$build_setpriv" = xyes]) +PKG_CHECK_MODULES([PCRE], [libpcre2-8], [have_pcre=yes], [have_pcre=no]) +AS_IF([test "x$have_pcre" = xyes ], [ + AC_DEFINE([HAVE_PCRE], [1], [Define if libpcre2 is available]) +]) +AM_CONDITIONAL([HAVE_PCRE], [test "x$have_pcre" = xyes]) + +AC_ARG_ENABLE([hardlink], + AS_HELP_STRING([--disable-hardlink], [do not build hardlink]), + [], [UL_DEFAULT_ENABLE([hardlink], [check])] +) +UL_BUILD_INIT([hardlink]) +AM_CONDITIONAL([BUILD_HARDLINK], [test "x$build_hardlink" = xyes]) AC_ARG_ENABLE([eject], AS_HELP_STRING([--disable-eject], [do not build eject]), diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 3043687e6..f56a819ac 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -216,3 +216,15 @@ fincore_SOURCES = misc-utils/fincore.c fincore_LDADD = $(LDADD) libsmartcols.la libcommon.la fincore_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) endif + +if BUILD_HARDLINK +usrbin_exec_PROGRAMS += hardlink +hardlink_SOURCES = misc-utils/hardlink.c +hardlink_LDADD = $(LDADD) libcommon.la +hardlink_CFLAGS = $(AM_CFLAGS) +if HAVE_PCRE +hardlink_LDADD += $(PCRE_LIBS) +hardlink_CFLAGS += $(PCRE_CFLAGS) +endif +dist_man_MANS += misc-utils/hardlink.1 +endif diff --git a/misc-utils/hardlink.1 b/misc-utils/hardlink.1 new file mode 100644 index 000000000..5aa022a1f --- /dev/null +++ b/misc-utils/hardlink.1 @@ -0,0 +1,62 @@ +.TH "hardlink" "1" +.SH "NAME" +hardlink \- Consolidate duplicate files via hardlinks +.SH "SYNOPSIS" +.PP +\fBhardlink\fP [\fB-c\fP] [\fB-n\fP] [\fB-v\fP] [\fB-vv\fP] [\fB-x pattern\fP] [\fB-h\fP] directory1 [ directory2 ... ] +.SH "DESCRIPTION" +.PP +This manual page documents \fBhardlink\fP, a +program which consolidates duplicate files in one or more directories +using hardlinks. +.PP +\fBhardlink\fP traverses one +or more directories searching for duplicate files. When it finds duplicate +files, it uses one of them as the master. It then removes all other +duplicates and places a hardlink for each one pointing to the master file. +This allows for conservation of disk space where multiple directories +on a single filesystem contain many duplicate files. +.PP +Since hard links can only span a single filesystem, \fBhardlink\fP +is only useful when all directories specified are on the same filesystem. +.SH "OPTIONS" +.PP +.IP "\fB-c\fP" 10 +Compare only the contents of the files being considered for consolidation. +Disregards permission, ownership and other differences. +.IP "\fB-f\fP" 10 +Force hardlinking across file systems. +.IP "\fB-n\fP" 10 +Do not perform the consolidation; only print what would be changed. +.IP "\fB-v\fP" 10 +Print summary after hardlinking. +.IP "\fB-vv\fP" 10 +Print every hardlinked file and bytes saved. Also print summary after hardlinking. +.IP "\fB-x pattern\fP" 10 +Exclude files and directories matching pattern from hardlinking. +.IP "\fB-h\fP" 10 +Show help. +.PP +The optional pattern for excluding files and directories must be a PCRE2 +compatible regular expression. Only the basename of the file or directory +is checked, not its path. Excluded directories' contents will not be examined. +.SH "AUTHOR" +.PP +\fBhardlink\fP was written by Jakub Jelinek <jakub@redhat.com>. +.PP +Man page written by Brian Long. +.PP +Man page updated by Jindrich Novy <jnovy@redhat.com> +.SH "BUGS" +.PP +\fBhardlink\fP assumes that its target directory trees do not change from under +it. If a directory tree does change, this may result in \fBhardlink\fP +accessing files and/or directories outside of the intended directory tree. +Thus, you must avoid running \fBhardlink\fP on potentially changing directory +trees, and especially on directory trees under control of another user. +.PP +Historically \fBhardlink\fP silently excluded any names beginning with +".in.", as well as any names beginning with "." followed by exactly 6 +other characters. That prior behavior can be achieved by specifying +.br +-x '^(\\.in\\.|\\.[^.]{6}$)' diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c new file mode 100644 index 000000000..56edaa686 --- /dev/null +++ b/misc-utils/hardlink.c @@ -0,0 +1,534 @@ +/* + * hardlink - consolidate duplicate files via hardlinks + * + * Copyright (C) 2018 Red Hat, Inc. All rights reserved. + * Written by Jakub Jelinek <jakub@redhat.com> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it would be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <sys/types.h> +#include <stdlib.h> +#include <getopt.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/mman.h> +#include <string.h> +#include <dirent.h> +#include <fcntl.h> +#include <errno.h> +#ifdef HAVE_PCRE +# define PCRE2_CODE_UNIT_WIDTH 8 +# include <pcre2.h> +#endif + +#include "c.h" +#include "nls.h" +#include "closestream.h" + +#define NHASH (1<<17) /* Must be a power of 2! */ +#define NIOBUF (1<<12) +#define NAMELEN 4096 +#define NBUF 64 + +#ifdef HAVE_PCRE +pcre2_code *re; +PCRE2_SPTR exclude_pattern; +pcre2_match_data *match_data; +#endif + +struct _f; +typedef struct _h { + struct _h *next; + struct _f *chain; + off_t size; + time_t mtime; +} h; + +typedef struct _d { + struct _d *next; + char name[0]; +} d; + +d *dirs; + +h *hps[NHASH]; + +int no_link = 0; +int verbose = 0; +int content_only = 0; +int force = 0; + +typedef struct _f { + struct _f *next; + ino_t ino; + dev_t dev; + unsigned int cksum; + char name[0]; +} f; + +__attribute__ ((always_inline)) +static inline unsigned int hash(off_t size, time_t mtime) +{ + return (size ^ mtime) & (NHASH - 1); +} + +__attribute__ ((always_inline)) +static inline int stcmp(struct stat *st1, struct stat *st2, int content_only) +{ + if (content_only) + return st1->st_size != st2->st_size; + return st1->st_mode != st2->st_mode || st1->st_uid != st2->st_uid || + st1->st_gid != st2->st_gid || st1->st_size != st2->st_size || + st1->st_mtime != st2->st_mtime; +} + +long long ndirs, nobjects, nregfiles, ncomp, nlinks, nsaved; + +static void doexit(int i) +{ + if (verbose) { + fprintf(stderr, "\n\n"); + fprintf(stderr, "Directories %lld\n", ndirs); + fprintf(stderr, "Objects %lld\n", nobjects); + fprintf(stderr, "IFREG %lld\n", nregfiles); + fprintf(stderr, "Comparisons %lld\n", ncomp); + fprintf(stderr, "%s %lld\n", + (no_link ? "Would link" : "Linked"), nlinks); + fprintf(stderr, "%s %lld\n", (no_link ? "Would save" : "saved"), + nsaved); + } + exit(i); +} + +static void __attribute__((__noreturn__)) usage(void) +{ + fputs(USAGE_HEADER, stdout); + printf(_(" %s [options] directory...\n"), program_invocation_short_name); + + fputs(USAGE_SEPARATOR, stdout); + puts(_("Consolidate duplicate files using hardlinks.")); + + fputs(USAGE_OPTIONS, stdout); + puts(_(" -c when finding candidates for linking, compare only file contents")); + puts(_(" -n don't actually link anything, just report what would be done")); + puts(_(" -v print summary after hardlinking")); + puts(_(" -vv print every hardlinked file and bytes saved + summary")); + puts(_(" -f force hardlinking across filesystems")); + puts(_(" -x <regex> exclude files matching pattern")); + fputs(USAGE_SEPARATOR, stdout); + printf(USAGE_HELP_OPTIONS(16)); /* char offset to align option descriptions */ + printf(USAGE_MAN_TAIL("hardlink(1)")); + exit(EXIT_SUCCESS); +} + + +unsigned int buf[NBUF]; +char iobuf1[NIOBUF], iobuf2[NIOBUF]; + +__attribute__ ((always_inline)) +static inline size_t add2(size_t a, size_t b) +{ + size_t sum = a + b; + if (sum < a) { + fprintf(stderr, "\nInteger overflow\n"); + doexit(5); + } + return sum; +} + +__attribute__ ((always_inline)) +static inline size_t add3(size_t a, size_t b, size_t c) +{ + return add2(add2(a, b), c); +} + +typedef struct { + char *buf; + size_t alloc; +} dynstr; + +static void growstr(dynstr * str, size_t newlen) +{ + if (newlen < str->alloc) + return; + str->buf = realloc(str->buf, str->alloc = add2(newlen, 1)); + if (!str->buf) { + fprintf(stderr, "\nOut of memory 4\n"); + doexit(4); + } +} + +dev_t dev = 0; +static void rf(const char *name) +{ + struct stat st, st2, st3; + const size_t namelen = strlen(name); + nobjects++; + if (lstat(name, &st)) + return; + if (st.st_dev != dev && !force) { + if (dev) { + fprintf(stderr, + "%s is on different filesystem than the rest.\nUse -f option to override.\n", + name); + doexit(6); + } + dev = st.st_dev; + } + if (S_ISDIR(st.st_mode)) { + d *dp = malloc(add3(sizeof(d), namelen, 1)); + if (!dp) { + fprintf(stderr, "\nOut of memory 3\n"); + doexit(3); + } + memcpy(dp->name, name, namelen + 1); + dp->next = dirs; + dirs = dp; + } else if (S_ISREG(st.st_mode)) { + int fd, i; + f *fp, *fp2; + h *hp; + const char *n1, *n2; + int cksumsize = sizeof(buf); + unsigned int cksum; + time_t mtime = content_only ? 0 : st.st_mtime; + unsigned int hsh = hash(st.st_size, mtime); + off_t fsize; + nregfiles++; + if (verbose > 1) + fprintf(stderr, " %s", name); + fd = open(name, O_RDONLY); + if (fd < 0) + return; + if ((size_t)st.st_size < sizeof(buf)) { + cksumsize = st.st_size; + memset(((char *)buf) + cksumsize, 0, + (sizeof(buf) - cksumsize) % sizeof(buf[0])); + } + if (read(fd, buf, cksumsize) != cksumsize) { + close(fd); + if (verbose > 1 && namelen <= NAMELEN) + fprintf(stderr, "\r%*s\r", (int)(namelen + 2), + ""); + return; + } + cksumsize = (cksumsize + sizeof(buf[0]) - 1) / sizeof(buf[0]); + for (i = 0, cksum = 0; i < cksumsize; i++) { + if (cksum + buf[i] < cksum) + cksum += buf[i] + 1; + else + cksum += buf[i]; + } + for (hp = hps[hsh]; hp; hp = hp->next) + if (hp->size == st.st_size && hp->mtime == mtime) + break; + if (!hp) { + hp = malloc(sizeof(h)); + if (!hp) { + fprintf(stderr, "\nOut of memory 1\n"); + doexit(1); + } + hp->size = st.st_size; + hp->mtime = mtime; + hp->chain = NULL; + hp->next = hps[hsh]; + hps[hsh] = hp; + } + for (fp = hp->chain; fp; fp = fp->next) + if (fp->cksum == cksum) + break; + for (fp2 = fp; fp2 && fp2->cksum == cksum; fp2 = fp2->next) + if (fp2->ino == st.st_ino && fp2->dev == st.st_dev) { + close(fd); + if (verbose > 1 && namelen <= NAMELEN) + fprintf(stderr, "\r%*s\r", + (int)(namelen + 2), ""); + return; + } + for (fp2 = fp; fp2 && fp2->cksum == cksum; fp2 = fp2->next) + if (!lstat(fp2->name, &st2) && S_ISREG(st2.st_mode) && + !stcmp(&st, &st2, content_only) && + st2.st_ino != st.st_ino && + st2.st_dev == st.st_dev) { + int fd2 = open(fp2->name, O_RDONLY); + if (fd2 < 0) + continue; + if (fstat(fd2, &st2) || !S_ISREG(st2.st_mode) + || st2.st_size == 0) { + close(fd2); + continue; + } + ncomp++; + lseek(fd, 0, SEEK_SET); + for (fsize = st.st_size; fsize > 0; + fsize -= NIOBUF) { + off_t rsize = + fsize >= NIOBUF ? NIOBUF : fsize; + if (read(fd, iobuf1, rsize) != rsize + || read(fd2, iobuf2, + rsize) != rsize) { + close(fd); + close(fd2); + fprintf(stderr, + "\nReading error\n"); + return; + } + if (memcmp(iobuf1, iobuf2, rsize)) + break; + } + close(fd2); + if (fsize > 0) + continue; + if (lstat(name, &st3)) { + fprintf(stderr, + "\nCould not stat %s again\n", + name); + close(fd); + return; + } + st3.st_atime = st.st_atime; + if (stcmp(&st, &st3, 0)) { + fprintf(stderr, + "\nFile %s changed underneath us\n", + name); + close(fd); + return; + } + n1 = fp2->name; + n2 = name; + if (!no_link) { + const char *suffix = + ".$$$___cleanit___$$$"; + const size_t suffixlen = strlen(suffix); + size_t n2len = strlen(n2); + dynstr nam2 = { NULL, 0 }; + growstr(&nam2, add2(n2len, suffixlen)); + memcpy(nam2.buf, n2, n2len); + memcpy(&nam2.buf[n2len], suffix, + suffixlen + 1); + /* First create a temporary link to n1 under a new name */ + if (link(n1, nam2.buf)) { + fprintf(stderr, + "\nFailed to hardlink %s to %s (create temporary link as %s failed - %s)\n", + n1, n2, nam2.buf, + strerror(errno)); + free(nam2.buf); + continue; + } + /* Then rename into place over the existing n2 */ + if (rename(nam2.buf, n2)) { + fprintf(stderr, + "\nFailed to hardlink %s to %s (rename temporary link to %s failed - %s)\n", + n1, n2, n2, + strerror(errno)); + /* Something went wrong, try to remove the now redundant temporary link */ + if (unlink(nam2.buf)) { + fprintf(stderr, + "\nFailed to remove temporary link %s - %s\n", + nam2.buf, + strerror + (errno)); + } + free(nam2.buf); + continue; + } + free(nam2.buf); + } + nlinks++; + if (st3.st_nlink > 1) { + /* We actually did not save anything this time, since the link second argument + had some other links as well. */ + if (verbose > 1) + fprintf(stderr, + "\r%*s\r%s %s to %s\n", + (int)(((namelen > + NAMELEN) ? 0 : + namelen) + 2), + "", + (no_link ? "Would link" + : "Linked"), n1, n2); + } else { + nsaved += + ((st.st_size + 4095) / 4096) * 4096; + if (verbose > 1) + fprintf(stderr, + "\r%*s\r%s %s to %s, %s %jd\n", + (int)(((namelen > + NAMELEN) ? 0 : + namelen) + 2), + "", + (no_link ? "Would link" + : "Linked"), n1, n2, + (no_link ? "would save" + : "saved"), + (intmax_t)st.st_size); + } + close(fd); + return; + } + fp2 = malloc(add3(sizeof(f), namelen, 1)); + if (!fp2) { + fprintf(stderr, "\nOut of memory 2\n"); + doexit(2); + } + close(fd); + fp2->ino = st.st_ino; + fp2->dev = st.st_dev; + fp2->cksum = cksum; + memcpy(fp2->name, name, namelen + 1); + if (fp) { + fp2->next = fp->next; + fp->next = fp2; + } else { + fp2->next = hp->chain; + hp->chain = fp2; + } + if (verbose > 1 && namelen <= NAMELEN) + fprintf(stderr, "\r%*s\r", (int)(namelen + 2), ""); + return; + } +} + +int main(int argc, char **argv) +{ + int ch; + int i; +#ifdef HAVE_PCRE + int errornumber; + PCRE2_SIZE erroroffset; +#endif + dynstr nam1 = { NULL, 0 }; + + static const struct option longopts[] = { + { "version", no_argument, NULL, 'V' }, + { "help", no_argument, NULL, 'h' }, + { NULL, 0, NULL, 0 }, + }; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + atexit(close_stdout); + + while ((ch = getopt_long(argc, argv, "cnvfx:Vh", longopts, NULL)) != -1) { + switch (ch) { + case 'n': + no_link++; + break; + case 'v': + verbose++; + break; + case 'c': + content_only++; + break; + case 'f': + force = 1; + break; + case 'x': +#ifdef HAVE_PCRE + exclude_pattern = (PCRE2_SPTR) optarg; +#else + errx(EXIT_FAILURE, + _("option -x not supported (built without pcre2)")); + exit(1); +#endif + break; + case 'V': + printf(UTIL_LINUX_VERSION); + return EXIT_SUCCESS; + case 'h': + usage(); + default: + errtryhelp(EXIT_FAILURE); + } + } + + if (optind == argc) { + warnx(_("no directory specified")); + errtryhelp(EXIT_FAILURE); + } + +#ifdef HAVE_PCRE + if (exclude_pattern) { + re = pcre2_compile(exclude_pattern, /* the pattern */ + PCRE2_ZERO_TERMINATED, /* indicates pattern is zero-terminate */ + 0, /* default options */ + &errornumber, &erroroffset, NULL); /* use default compile context */ + if (!re) { + PCRE2_UCHAR buffer[256]; + pcre2_get_error_message(errornumber, buffer, + sizeof(buffer)); + errx(EXIT_FAILURE, _("pattern error at offset %d: %s"), + (int)erroroffset, buffer); + } + match_data = pcre2_match_data_create_from_pattern(re, NULL); + } +#endif + for (i = optind; i < argc; i++) + rf(argv[i]); + while (dirs) { + DIR *dh; + struct dirent *di; + d *dp = dirs; + size_t nam1baselen = strlen(dp->name); + dirs = dp->next; + growstr(&nam1, add2(nam1baselen, 1)); + memcpy(nam1.buf, dp->name, nam1baselen); + free(dp); + nam1.buf[nam1baselen++] = '/'; + nam1.buf[nam1baselen] = 0; + dh = opendir(nam1.buf); + if (dh == NULL) + continue; + ndirs++; + while ((di = readdir(dh)) != NULL) { + if (!di->d_name[0]) + continue; + if (di->d_name[0] == '.') { + if (!di->d_name[1] || !strcmp(di->d_name, "..")) + continue; + } +#ifdef HAVE_PCRE + if (re && pcre2_match(re, /* compiled regex */ + (PCRE2_SPTR) di->d_name, strlen(di->d_name), 0, /* start at offset 0 */ + 0, /* default options */ + match_data, /* block for storing the result */ + NULL) /* use default match context */ + >=0) { + if (verbose) { + nam1.buf[nam1baselen] = 0; + fprintf(stderr, "Skipping %s%s\n", + nam1.buf, di->d_name); + } + continue; + } +#endif + { + size_t subdirlen; + growstr(&nam1, + add2(nam1baselen, subdirlen = + strlen(di->d_name))); + memcpy(&nam1.buf[nam1baselen], di->d_name, + add2(subdirlen, 1)); + } + rf(nam1.buf); + } + closedir(dh); + } + doexit(0); + return 0; +} diff --git a/tests/commands.sh b/tests/commands.sh index 1be2d25b4..6f3139351 100644 --- a/tests/commands.sh +++ b/tests/commands.sh @@ -61,6 +61,7 @@ TS_CMD_FINDMNT=${TS_CMD_FINDMNT-"$top_builddir/findmnt"} TS_CMD_FSCKCRAMFS=${TS_CMD_FSCKCRAMFS:-"$top_builddir/fsck.cramfs"} TS_CMD_FSCKMINIX=${TS_CMD_FSCKMINIX:-"$top_builddir/fsck.minix"} TS_CMD_GETOPT=${TS_CMD_GETOPT-"$top_builddir/getopt"} +TS_CMD_HARDLINK=${TS_CMD_HARDLINK-"$top_builddir/hardlink"} TS_CMD_HEXDUMP=${TS_CMD_HEXDUMP-"$top_builddir/hexdump"} TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$top_builddir/hwclock"} TS_CMD_IONICE=${TS_CMD_IONICE-"$top_builddir/ionice"} diff --git a/tests/expected/hardlink/options-content b/tests/expected/hardlink/options-content new file mode 100644 index 000000000..a1bfede44 --- /dev/null +++ b/tests/expected/hardlink/options-content @@ -0,0 +1,26 @@ +dir-1/sdir-1/file-a-1 10 8192 1540236xxx perm +dir-1/sdir-1/file-a-2 10 8192 1540236xxx perm +dir-1/sdir-1/file-a-3 10 8192 1540236xxx perm +dir-1/sdir-1/file-b-1 10 8192 1540236xxx perm +dir-1/sdir-1/file-b-2 10 8192 1540236xxx perm +dir-1/sdir-1/file-b-3 10 8192 1540236xxx perm +dir-1/sdir-1/file-c-1 6 8192 1540236xxx perm +dir-1/sdir-1/file-c-2 6 8192 1540236xxx perm +dir-1/sdir-1/file-c-3 6 8192 1540236xxx perm +dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 10 8192 1540236xxx perm +dir-2/sdir-2/file-a-5 10 8192 1540236xxx perm +dir-2/sdir-2/file-b-5 10 8192 1540236xxx perm +dir-2/sdir-3/file-b-4 10 8192 1540236xxx perm +file-a-1 10 8192 1540236xxx perm +file-a-2 10 8192 1540236xxx perm +file-a-3 10 8192 1540236xxx perm +file-a-4 10 8192 1540236xxx perm +file-a-5 10 8192 1540236xxx perm +file-b-1 10 8192 1540236xxx perm +file-b-2 10 8192 1540236xxx perm +file-b-3 10 8192 1540236xxx perm +file-b-4 10 8192 1540236xxx perm +file-b-5 10 8192 1540236xxx perm +file-c-1 6 8192 1540236xxx perm +file-c-2 6 8192 1540236xxx perm +file-c-3 6 8192 1540236xxx perm diff --git a/tests/expected/hardlink/options-dryrun b/tests/expected/hardlink/options-dryrun new file mode 100644 index 000000000..4e9d65d75 --- /dev/null +++ b/tests/expected/hardlink/options-dryrun @@ -0,0 +1,34 @@ + + +Directories 7 +Objects 33 +IFREG 26 +Comparisons 18 +Would link 18 +Would save 147456 +dir-1/sdir-1/file-a-1 1 8192 1540236330 644 +dir-1/sdir-1/file-a-2 1 8192 1540236330 644 +dir-1/sdir-1/file-a-3 1 8192 1540236423 644 +dir-1/sdir-1/file-b-1 1 8192 1540236383 644 +dir-1/sdir-1/file-b-2 1 8192 1540236383 644 +dir-1/sdir-1/file-b-3 1 8192 1540236430 644 +dir-1/sdir-1/file-c-1 1 8192 1540236330 644 +dir-1/sdir-1/file-c-2 1 8192 1540236330 644 +dir-1/sdir-1/file-c-3 1 8192 1540236548 644 +dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 1 8192 1540236330 644 +dir-2/sdir-2/file-a-5 1 8192 1540236330 600 +dir-2/sdir-2/file-b-5 1 8192 1540236383 640 +dir-2/sdir-3/file-b-4 1 8192 1540236383 640 +file-a-1 1 8192 1540236330 644 +file-a-2 1 8192 1540236330 644 +file-a-3 1 8192 1540236423 644 +file-a-4 1 8192 1540236330 600 +file-a-5 1 8192 1540236330 600 +file-b-1 1 8192 1540236383 644 +file-b-2 1 8192 1540236383 644 +file-b-3 1 8192 1540236430 644 +file-b-4 1 8192 1540236383 640 +file-b-5 1 8192 1540236383 640 +file-c-1 1 8192 1540236330 644 +file-c-2 1 8192 1540236330 644 +file-c-3 1 8192 1540236548 644 diff --git a/tests/expected/hardlink/options-nargs b/tests/expected/hardlink/options-nargs new file mode 100644 index 000000000..7705bba30 --- /dev/null +++ b/tests/expected/hardlink/options-nargs @@ -0,0 +1,34 @@ + + +Directories 1 +Objects 16 +IFREG 15 +Comparisons 9 +Linked 9 +saved 73728 +dir-1/sdir-1/file-a-1 4 8192 1540236330 644 +dir-1/sdir-1/file-a-2 4 8192 1540236330 644 +dir-1/sdir-1/file-a-3 1 8192 1540236423 644 +dir-1/sdir-1/file-b-1 4 8192 1540236383 644 +dir-1/sdir-1/file-b-2 4 8192 1540236383 644 +dir-1/sdir-1/file-b-3 1 8192 1540236430 644 +dir-1/sdir-1/file-c-1 4 8192 1540236330 644 +dir-1/sdir-1/file-c-2 4 8192 1540236330 644 +dir-1/sdir-1/file-c-3 1 8192 1540236548 644 +dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 1 8192 1540236330 644 +dir-2/sdir-2/file-a-5 1 8192 1540236330 600 +dir-2/sdir-2/file-b-5 1 8192 1540236383 640 +dir-2/sdir-3/file-b-4 1 8192 1540236383 640 +file-a-1 4 8192 1540236330 644 +file-a-2 4 8192 1540236330 644 +file-a-3 1 8192 1540236423 644 +file-a-4 1 8192 1540236330 600 +file-a-5 1 8192 1540236330 600 +file-b-1 4 8192 1540236383 644 +file-b-2 4 8192 1540236383 644 +file-b-3 1 8192 1540236430 644 +file-b-4 1 8192 1540236383 640 +file-b-5 1 8192 1540236383 640 +file-c-1 4 8192 1540236330 644 +file-c-2 4 8192 1540236330 644 +file-c-3 1 8192 1540236548 644 diff --git a/tests/expected/hardlink/options-noregex b/tests/expected/hardlink/options-noregex new file mode 100644 index 000000000..93363adcb --- /dev/null +++ b/tests/expected/hardlink/options-noregex @@ -0,0 +1 @@ +hardlink: option -x not supported (built without pcre2) diff --git a/tests/expected/hardlink/options-orig b/tests/expected/hardlink/options-orig new file mode 100644 index 000000000..6b578233a --- /dev/null +++ b/tests/expected/hardlink/options-orig @@ -0,0 +1,26 @@ +dir-1/sdir-1/file-a-1 1 8192 1540236330 644 +dir-1/sdir-1/file-a-2 1 8192 1540236330 644 +dir-1/sdir-1/file-a-3 1 8192 1540236423 644 +dir-1/sdir-1/file-b-1 1 8192 1540236383 644 +dir-1/sdir-1/file-b-2 1 8192 1540236383 644 +dir-1/sdir-1/file-b-3 1 8192 1540236430 644 +dir-1/sdir-1/file-c-1 1 8192 1540236330 644 +dir-1/sdir-1/file-c-2 1 8192 1540236330 644 +dir-1/sdir-1/file-c-3 1 8192 1540236548 644 +dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 1 8192 1540236330 644 +dir-2/sdir-2/file-a-5 1 8192 1540236330 600 +dir-2/sdir-2/file-b-5 1 8192 1540236383 640 +dir-2/sdir-3/file-b-4 1 8192 1540236383 640 +file-a-1 1 8192 1540236330 644 +file-a-2 1 8192 1540236330 644 +file-a-3 1 8192 1540236423 644 +file-a-4 1 8192 1540236330 600 +file-a-5 1 8192 1540236330 600 +file-b-1 1 8192 1540236383 644 +file-b-2 1 8192 1540236383 644 +file-b-3 1 8192 1540236430 644 +file-b-4 1 8192 1540236383 640 +file-b-5 1 8192 1540236383 640 +file-c-1 1 8192 1540236330 644 +file-c-2 1 8192 1540236330 644 +file-c-3 1 8192 1540236548 644 diff --git a/tests/expected/hardlink/options-regex-escapes b/tests/expected/hardlink/options-regex-escapes new file mode 100644 index 000000000..afab5e35d --- /dev/null +++ b/tests/expected/hardlink/options-regex-escapes @@ -0,0 +1,26 @@ +dir-1/sdir-1/file-a-1 4 8192 1540236330 644 +dir-1/sdir-1/file-a-2 4 8192 1540236330 644 +dir-1/sdir-1/file-a-3 2 8192 1540236423 644 +dir-1/sdir-1/file-b-1 4 8192 1540236383 644 +dir-1/sdir-1/file-b-2 4 8192 1540236383 644 +dir-1/sdir-1/file-b-3 2 8192 1540236430 644 +dir-1/sdir-1/file-c-1 4 8192 1540236330 644 +dir-1/sdir-1/file-c-2 4 8192 1540236330 644 +dir-1/sdir-1/file-c-3 2 8192 1540236548 644 +dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 1 8192 1540236330 644 +dir-2/sdir-2/file-a-5 3 8192 1540236330 600 +dir-2/sdir-2/file-b-5 4 8192 1540236383 640 +dir-2/sdir-3/file-b-4 4 8192 1540236383 640 +file-a-1 4 8192 1540236330 644 +file-a-2 4 8192 1540236330 644 +file-a-3 2 8192 1540236423 644 +file-a-4 3 8192 1540236330 600 +file-a-5 3 8192 1540236330 600 +file-b-1 4 8192 1540236383 644 +file-b-2 4 8192 1540236383 644 +file-b-3 2 8192 1540236430 644 +file-b-4 4 8192 1540236383 640 +file-b-5 4 8192 1540236383 640 +file-c-1 4 8192 1540236330 644 +file-c-2 4 8192 1540236330 644 +file-c-3 2 8192 1540236548 644 diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options new file mode 100755 index 000000000..848ea1654 --- /dev/null +++ b/tests/ts/hardlink/options @@ -0,0 +1,78 @@ +#!/bin/bash +# +# Copyright (C) 2018 Ruediger Meier <ruediger.meier@ga-group.nl> +# +# This file is part of util-linux. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +TS_TOPDIR="${0%/*}/../.." +TS_DESC="options" + +. $TS_TOPDIR/functions.sh + +ts_init "$*" + +ts_check_test_command "$TS_CMD_HARDLINK" + +SRCDIR="$TS_OUTDIR/testdir1" + +create_srcdir() +{ + rm -rf "$SRCDIR" + tar -C "$TS_OUTDIR" -xJf "$TS_SELF/testdir1.tar.xz" +} + +show_srcdir() +{ + find "$SRCDIR" -type f -printf "%P\t%n\t%s\t%Ts\t%m\n" | sort +} + +create_srcdir + +ts_init_subtest "orig" # just list original dir +show_srcdir >>$TS_OUTPUT 2>&1 +ts_finalize_subtest + +ts_init_subtest "dryrun" +$TS_CMD_HARDLINK -n -v "$SRCDIR" >>$TS_OUTPUT 2>&1 +show_srcdir >>$TS_OUTPUT 2>&1 +ts_finalize_subtest + +ts_init_subtest "nargs" +$TS_CMD_HARDLINK -v "$SRCDIR"/dir-1/sdir-1 "$SRCDIR"/file-?-{1,2} >>$TS_OUTPUT 2>&1 +show_srcdir >>$TS_OUTPUT 2>&1 +ts_finalize_subtest + +# cases without and with -x support +tmp=$($TS_CMD_HARDLINK -x pattern "$SRCDIR"/dir-1/sdir-2 2>&1) +if test $? -ne 0; then + ts_init_subtest "noregex" + printf "%s\n" "$tmp" >>$TS_OUTPUT 2>&1 + ts_finalize_subtest +else + ts_init_subtest "regex-escapes" + $TS_CMD_HARDLINK -x '.*z-"§\$%&\(\)=\?\*\+$' "$SRCDIR" >>$TS_OUTPUT 2>&1 + show_srcdir >>$TS_OUTPUT 2>&1 + ts_finalize_subtest +fi + +ts_init_subtest "content" +$TS_CMD_HARDLINK -c "$SRCDIR" >>$TS_OUTPUT 2>&1 +# When using -c we need to cheat with sed because it's not deterministic which +# file (i.e. which timestamp and perms) wins. TODO at least the choice of the +# permissions should be sensitive by default and/or controllable by the user. +show_srcdir | sed 's/\(1540236\).*/\1xxx\tperm/' >>$TS_OUTPUT 2>&1 +ts_finalize_subtest + +rm -rf "$SRCDIR" +ts_finalize diff --git a/tests/ts/hardlink/testdir1.tar.xz b/tests/ts/hardlink/testdir1.tar.xz Binary files differnew file mode 100644 index 000000000..b9bc245d1 --- /dev/null +++ b/tests/ts/hardlink/testdir1.tar.xz |