+++ /dev/null
-From 8c022656320592dbad146f5d3a3ae1875f419446 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu, 5 Mar 2020 17:25:29 -0800
-Subject: [PATCH 1/2] ls: restore 8.31 behavior on removed directories
-
-* NEWS: Mention this.
-* src/ls.c: Do not include <sys/sycall.h>
-(print_dir): Don't worry about whether the directory is removed.
-* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
-behavior.
-
-Upstream-commit: 10fcb97bd728f09d4a027eddf8ad2900f0819b0a
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- src/ls.c | 22 ----------------------
- tests/ls/removed-directory.sh | 10 ++--------
- 2 files changed, 2 insertions(+), 30 deletions(-)
-
-diff --git a/src/ls.c b/src/ls.c
-index 9d25f62..850ecc2 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -49,10 +49,6 @@
- # include <sys/ptem.h>
- #endif
-
--#ifdef __linux__
--# include <sys/syscall.h>
--#endif
--
- #include <stdio.h>
- #include <assert.h>
- #include <setjmp.h>
-@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- struct dirent *next;
- uintmax_t total_blocks = 0;
- static bool first = true;
-- bool found_any_entries = false;
-
- errno = 0;
- dirp = opendir (name);
-@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- next = readdir (dirp);
- if (next)
- {
-- found_any_entries = true;
- if (! file_ignored (next->d_name))
- {
- enum filetype type = unknown;
-@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
- if (errno != EOVERFLOW)
- break;
- }
--#ifdef __linux__
-- else if (! found_any_entries)
-- {
-- /* If readdir finds no directory entries at all, not even "." or
-- "..", then double check that the directory exists. */
-- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
-- && errno != EINVAL)
-- {
-- /* We exclude EINVAL as that pertains to buffer handling,
-- and we've passed NULL as the buffer for simplicity.
-- ENOENT is returned if appropriate before buffer handling. */
-- file_failure (command_line_arg, _("reading directory %s"), name);
-- }
-- break;
-- }
--#endif
- else
- break;
-
-diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
-index e8c835d..fe8f929 100755
---- a/tests/ls/removed-directory.sh
-+++ b/tests/ls/removed-directory.sh
-@@ -26,20 +26,14 @@ case $host_triplet in
- *) skip_ 'non linux kernel' ;;
- esac
-
--LS_FAILURE=2
--
--cat <<\EOF >exp-err || framework_failure_
--ls: reading directory '.': No such file or directory
--EOF
--
- cwd=$(pwd)
- mkdir d || framework_failure_
- cd d || framework_failure_
- rmdir ../d || framework_failure_
-
--returns_ $LS_FAILURE ls >../out 2>../err || fail=1
-+ls >../out 2>../err || fail=1
- cd "$cwd" || framework_failure_
- compare /dev/null out || fail=1
--compare exp-err err || fail=1
-+compare /dev/null err || fail=1
-
- Exit $fail
---
-2.21.1
-
-
-From 847324a0debd9d12062c79e7a7a9d3d8ce76390d Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sat, 7 Mar 2020 10:29:51 -0800
-Subject: [PATCH 2/2] ls: improve removed-directory test
-
-* tests/ls/removed-directory.sh: Remove host_triplet test.
-Skip this test if one cannot remove the working directory.
-From a suggestion by Bernhard Voelker (Bug#39929).
-
-Upstream-commit: 672819c73f2e94e61386dc0584bddf9da860cc26
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- tests/ls/removed-directory.sh | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
-index fe8f929..63b209d 100755
---- a/tests/ls/removed-directory.sh
-+++ b/tests/ls/removed-directory.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
--# If ls is asked to list a removed directory (e.g. the parent process's
--# current working directory that has been removed by another process), it
--# emits an error message.
-+# If ls is asked to list a removed directory (e.g., the parent process's
-+# current working directory has been removed by another process), it
-+# should not emit an error message merely because the directory is removed.
-
- # Copyright (C) 2020 Free Software Foundation, Inc.
-
-@@ -21,15 +21,10 @@
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
- print_ver_ ls
-
--case $host_triplet in
-- *linux*) ;;
-- *) skip_ 'non linux kernel' ;;
--esac
--
- cwd=$(pwd)
- mkdir d || framework_failure_
- cd d || framework_failure_
--rmdir ../d || framework_failure_
-+rmdir ../d || skip_ "can't remove working directory on this platform"
-
- ls >../out 2>../err || fail=1
- cd "$cwd" || framework_failure_
---
-2.21.1
-
-diff -crB coreutils-8.21/src/copy.c coreutils-8.21-patch0.5/src/copy.c
-*** coreutils-8.21/src/copy.c 2013-02-07 10:37:05.000000000 +0100
---- coreutils-8.21-patch0.5/src/copy.c 2013-02-23 12:53:51.000000000 +0100
-***************
-*** 135,140 ****
---- 135,190 ----
- return err;
- }
-
-+ /* BEGIN progress mod */
-+ static void file_progress_bar ( char * _cDest, int _iBarLength, int _iProgress, int _iTotal )
-+ {
-+ // write number to progress bar
-+ float fPercent = ( float ) _iProgress / ( float ) _iTotal * 100.f;
-+ sprintf ( _cDest + ( _iBarLength - 6 ), "%4.1f", fPercent );
-+ // remove zero
-+ _cDest[_iBarLength - 2] = ' ';
-+
-+ // fill rest with '-'
-+ int i;
-+ for ( i = 1; i <= _iBarLength - 9; i++ )
-+ {
-+ if ( fPercent > ( float ) ( i - 1 ) / ( _iBarLength - 10 ) * 100.f )
-+ _cDest[i] = '|';
-+ else
-+ _cDest[i] = '-';
-+ }
-+ }
-+
-+ int file_size_format ( char * _cDst, int _iSize, int _iCounter )
-+ {
-+ int iCounter = _iCounter;
-+ double dSize = ( double ) _iSize;
-+ while ( dSize >= 1000. )
-+ {
-+ dSize /= 1024.;
-+ iCounter++;
-+ }
-+
-+ /* get unit */
-+ char * sUnit;
-+ if ( iCounter == 0 )
-+ sUnit = "B";
-+ else if ( iCounter == 1 )
-+ sUnit = "KiB";
-+ else if ( iCounter == 2 )
-+ sUnit = "MiB";
-+ else if ( iCounter == 3 )
-+ sUnit = "GiB";
-+ else if ( iCounter == 4 )
-+ sUnit = "TiB";
-+ else
-+ sUnit = "N/A";
-+
-+ /* write number */
-+ return sprintf ( _cDst, "%5.1f %s", dSize, sUnit );
-+ }
-+ /* END progress mod */
-+
- /* Copy the regular file open on SRC_FD/SRC_NAME to DST_FD/DST_NAME,
- honoring the MAKE_HOLES setting and using the BUF_SIZE-byte buffer
- BUF for temporary storage. Copy no more than MAX_N_READ bytes.
-***************
-*** 151,163 ****
- bool make_holes,
- char const *src_name, char const *dst_name,
- uintmax_t max_n_read, off_t *total_n_read,
-! bool *last_write_made_hole)
- {
- *last_write_made_hole = false;
- *total_n_read = 0;
-
- while (max_n_read)
- {
- bool make_hole = false;
-
- ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
---- 201,369 ----
- bool make_holes,
- char const *src_name, char const *dst_name,
- uintmax_t max_n_read, off_t *total_n_read,
-! bool *last_write_made_hole
-! )
- {
-+ /* BEGIN progress mod */
-+ /* create a field of 6 lines */
-+ char ** cProgressField = ( char ** ) calloc ( 6, sizeof ( char * ) );
-+ /* get console width */
-+ int iBarLength = 80;
-+ struct winsize win;
-+ if ( ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win) == 0 && win.ws_col > 0 )
-+ iBarLength = win.ws_col;
-+ /* create rows */
-+ int it;
-+ for ( it = 0; it < 6; it++ )
-+ {
-+ cProgressField[it] = ( char * ) malloc ( iBarLength + 1 );
-+ /* init with spaces */
-+ int j;
-+ for ( j = 0; j < iBarLength; j++ )
-+ cProgressField[it][j] = ' ';
-+ cProgressField[it][iBarLength] = '\0';
-+ }
-+
-+ /* global progress bar? */
-+ if ( g_iTotalSize )
-+ {
-+ /* init global progress bar */
-+ cProgressField[2][0] = '[';
-+ cProgressField[2][iBarLength - 8] = ']';
-+ cProgressField[2][iBarLength - 7] = ' ';
-+ cProgressField[2][iBarLength - 1] = '%';
-+
-+ /* total size */
-+ cProgressField[1][iBarLength - 11] = '/';
-+ file_size_format ( cProgressField[1] + iBarLength - 9, g_iTotalSize, 1 );
-+
-+ /* show how many files were written */
-+ int sum_length = sprintf ( cProgressField[1], "%d files copied so far...", g_iFilesCopied );
-+ cProgressField[1][sum_length] = ' ';
-+ }
-+
-+ /* truncate filename? */
-+ int fn_length;
-+ if ( strlen ( src_name ) > iBarLength - 22 )
-+ fn_length =
-+ sprintf ( cProgressField[4], "...%s", src_name + ( strlen ( src_name ) - iBarLength + 25 ) );
-+ else
-+ fn_length = sprintf ( cProgressField[4], "%s", src_name );
-+ cProgressField[4][fn_length] = ' ';
-+
-+ /* filesize */
-+ int file_size = max_n_read;
-+ struct stat file_stat;
-+ if (fstat(src_fd, & file_stat) == 0)
-+ file_size = file_stat.st_size;
-+ cProgressField[4][iBarLength - 11] = '/';
-+ file_size_format ( cProgressField[4] + iBarLength - 9, file_size, 0 );
-+
-+ int iCountDown = 1;
-+ char * sProgressBar = cProgressField[5];
-+ sProgressBar[0] = '[';
-+ sProgressBar[iBarLength - 8] = ']';
-+ sProgressBar[iBarLength - 7] = ' ';
-+ sProgressBar[iBarLength - 1] = '%';
-+
-+ /* this will always save the time in between */
-+ struct timeval last_time;
-+ gettimeofday ( & last_time, NULL );
-+ int last_size = g_iTotalWritten;
-+ /* END progress mod */
-+
- *last_write_made_hole = false;
- *total_n_read = 0;
-
- while (max_n_read)
- {
-+ /* BEGIN progress mod */
-+ if (progress) {
-+ /* update countdown */
-+ iCountDown--;
-+ if ( iCountDown < 0 )
-+ {
-+ /* average copy speed is assumed to be around 10 MiB/s, just to be safe.
-+ * the status should be updated about 10 times per second, or approximately
-+ * once per 1 MiB transferred. */
-+ iCountDown = 1024 * 1024 / buf_size;
-+ /* must be greater than 0 */
-+ if (iCountDown < 1)
-+ iCountDown = 1;
-+ /* limit */
-+ if (iCountDown > 100)
-+ iCountDown = 100;
-+ }
-+
-+ /* just print one line with the percentage, but not always */
-+ if ( iCountDown == 0 )
-+ {
-+ /* calculate current speed */
-+ struct timeval cur_time;
-+ gettimeofday ( & cur_time, NULL );
-+ int cur_size = g_iTotalWritten + *total_n_read / 1024;
-+ int usec_elapsed = cur_time.tv_usec - last_time.tv_usec;
-+ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
-+ sec_elapsed += ( double ) ( cur_time.tv_sec - last_time.tv_sec );
-+ int copy_speed = ( int ) ( ( double ) ( cur_size - last_size )
-+ / sec_elapsed );
-+ if (copy_speed < 0)
-+ copy_speed = 0;
-+ char s_copy_speed[20];
-+ file_size_format ( s_copy_speed, copy_speed, 1 );
-+ /* update vars */
-+ last_time = cur_time;
-+ last_size = cur_size;
-+
-+ /* how much time has passed since the start? */
-+ int isec_elapsed = cur_time.tv_sec - g_oStartTime.tv_sec;
-+ int sec_remaining = ( int ) ( ( double ) isec_elapsed / cur_size
-+ * g_iTotalSize ) - isec_elapsed;
-+ int min_remaining = sec_remaining / 60;
-+ sec_remaining -= min_remaining * 60;
-+ int hours_remaining = min_remaining / 60;
-+ min_remaining -= hours_remaining * 60;
-+ /* print out */
-+ sprintf ( cProgressField[3],
-+ "Copying at %s/s (about %dh %dm %ds remaining)", s_copy_speed,
-+ hours_remaining, min_remaining, sec_remaining );
-+
-+ int fs_len;
-+ if ( g_iTotalSize )
-+ {
-+ /* global progress bar */
-+ file_progress_bar ( cProgressField[2], iBarLength,
-+ g_iTotalWritten + *total_n_read / 1024, g_iTotalSize );
-+
-+ /* print the global status */
-+ fs_len = file_size_format ( cProgressField[1] + iBarLength - 21,
-+ g_iTotalWritten + *total_n_read / 1024, 1 );
-+ cProgressField[1][iBarLength - 21 + fs_len] = ' ';
-+ }
-+
-+ /* current progress bar */
-+ file_progress_bar ( sProgressBar, iBarLength, *total_n_read, file_size );
-+
-+ /* print the status */
-+ fs_len = file_size_format ( cProgressField[4] + iBarLength - 21, *total_n_read, 0 );
-+ cProgressField[4][iBarLength - 21 + fs_len] = ' ';
-+
-+ /* print the field */
-+ for ( it = g_iTotalSize ? 0 : 3; it < 6; it++ )
-+ {
-+ printf ( "\033[K%s\n", cProgressField[it] );
-+ if ( strlen ( cProgressField[it] ) < iBarLength )
-+ printf ( "" );
-+ }
-+ if ( g_iTotalSize )
-+ printf ( "\r\033[6A" );
-+ else
-+ printf ( "\r\033[3A" );
-+ fflush ( stdout );
-+ }
-+ }
-+ /* END progress mod */
-+
- bool make_hole = false;
-
- ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
-***************
-*** 215,220 ****
---- 421,439 ----
-
- *last_write_made_hole = make_hole;
- }
-+
-+ if (progress) {
-+ /* BEGIN progress mod */
-+ /* update total size */
-+ g_iTotalWritten += *total_n_read / 1024;
-+ g_iFilesCopied++;
-+
-+ int i;
-+ for ( i = 0; i < 6; i++ )
-+ free ( cProgressField[i] );
-+ free ( cProgressField );
-+ /* END progress mod */
-+ }
-
- return true;
- }
-diff -crB coreutils-8.21/src/copy.h coreutils-8.21-patch0.5/src/copy.h
-*** coreutils-8.21/src/copy.h 2013-01-31 01:46:24.000000000 +0100
---- coreutils-8.21-patch0.5/src/copy.h 2013-02-23 12:53:51.000000000 +0100
-***************
-*** 227,232 ****
---- 227,235 ----
- /* If true, create symbolic links instead of copying files.
- Create destination directories as usual. */
- bool symbolic_link;
-+
-+ /* If true, draw a nice progress bar on screen */
-+ bool progress_bar;
-
- /* If true, do not copy a nondirectory that has an existing destination
- with the same or newer modification time. */
-***************
-*** 286,289 ****
---- 289,303 ----
- bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
- mode_t cached_umask (void);
-
-+ /* BEGIN progress mod */
-+ int file_size_format ( char * _cDst, int _iSize, int _iCounter );
-+
-+ long g_iTotalSize;
-+ long g_iTotalWritten;
-+ int g_iFilesCopied;
-+ struct timeval g_oStartTime;
-+ int g_iTotalFiles;
-+ bool progress;
-+ /* END progress mod */
-+
- #endif
-diff -crB coreutils-8.21/src/cp.c coreutils-8.21-patch0.5/src/cp.c
-*** coreutils-8.21/src/cp.c 2013-02-07 10:37:05.000000000 +0100
---- coreutils-8.21-patch0.5/src/cp.c 2013-02-23 12:53:51.000000000 +0100
-***************
-*** 141,146 ****
---- 141,147 ----
- {"target-directory", required_argument, NULL, 't'},
- {"update", no_argument, NULL, 'u'},
- {"verbose", no_argument, NULL, 'v'},
-+ {"progress-bar", no_argument, NULL, 'g'},
- {GETOPT_HELP_OPTION_DECL},
- {GETOPT_VERSION_OPTION_DECL},
- {NULL, 0, NULL, 0}
-***************
-*** 178,183 ****
---- 179,185 ----
- -f, --force if an existing destination file cannot be\n\
- opened, remove it and try again (this option\n\
- is ignored when the -n option is also used)\n\
-+ -g, --progress-bar add progress-bar\n\
- -i, --interactive prompt before overwrite (overrides a previous -n\
- \n\
- option)\n\
-***************
-*** 617,622 ****
---- 619,675 ----
- error (EXIT_FAILURE, 0, _("target %s is not a directory"),
- quote (file[n_files - 1]));
- }
-+
-+ /* BEGIN progress mod */
-+ struct timeval start_time;
-+ if (progress) {
-+ g_iTotalSize = 0;
-+ g_iFilesCopied = 0;
-+ g_iTotalWritten = 0;
-+
-+ /* save time */
-+ gettimeofday ( & start_time, NULL );
-+ g_oStartTime = start_time;
-+
-+ printf ( "Calculating total size... \r" );
-+ fflush ( stdout );
-+ long iTotalSize = 0;
-+ int iFiles = n_files;
-+ if ( ! target_directory )
-+ iFiles = n_files - 1;
-+ int j;
-+ for (j = 0; j < iFiles; j++)
-+ {
-+ /* call du -s for each file */
-+ /* create command */
-+ char command[1024];
-+ sprintf ( command, "du -s \"%s\"", file[j] );
-+ /* TODO: replace all quote signs in file[i] */
-+
-+ FILE *fp;
-+ char output[1024];
-+
-+ /* run command */
-+ fp = popen(command, "r");
-+ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
-+ printf("failed to run du.\n" );
-+ }
-+ else
-+ {
-+ /* isolate size */
-+ strchr ( output, '\t' )[0] = '\0';
-+ iTotalSize += atol ( output );
-+
-+ printf ( "Calculating total size... %ld\r", iTotalSize );
-+ fflush ( stdout );
-+ }
-+
-+ /* close */
-+ pclose(fp);
-+ }
-+ g_iTotalSize = iTotalSize;
-+ }
-+ /* END progress mod */
-
- if (target_directory)
- {
-***************
-*** 759,764 ****
---- 812,857 ----
-
- ok = copy (source, new_dest, 0, x, &unused, NULL);
- }
-+
-+ /* BEGIN progress mod */
-+ if (progress) {
-+ /* remove everything */
-+ int i;
-+ if ( g_iTotalSize )
-+ {
-+ for ( i = 0; i < 6; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[6A" );
-+ }
-+ else
-+ {
-+ for ( i = 0; i < 3; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[3A" );
-+ }
-+
-+ /* save time */
-+ struct timeval end_time;
-+ gettimeofday ( & end_time, NULL );
-+ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
-+ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
-+ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
-+
-+ /* get total size */
-+ char sTotalWritten[20];
-+ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
-+ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
-+
-+ /* calculate speed */
-+ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
-+ char s_copy_speed[20];
-+ file_size_format ( s_copy_speed, copy_speed, 1 );
-+
-+ /* good-bye message */
-+ printf ( "%d files (%s) copied in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
-+ sec_elapsed, s_copy_speed );
-+ }
-+ /* END progress mod */
-
- return ok;
- }
-***************
-*** 793,798 ****
---- 886,892 ----
- x->recursive = false;
- x->sparse_mode = SPARSE_AUTO;
- x->symbolic_link = false;
-+ x->progress_bar = false;
- x->set_mode = false;
- x->mode = 0;
-
-***************
-*** 933,939 ****
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
- long_opts, NULL))
- != -1)
- {
---- 1027,1033 ----
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:T",
- long_opts, NULL))
- != -1)
- {
-***************
-*** 990,995 ****
---- 1084,1093 ----
- x.unlink_dest_after_failed_open = true;
- break;
-
-+ case 'g':
-+ progress = true;
-+ break;
-+
- case 'H':
- x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
- break;
-diff -crB coreutils-8.21/src/mv.c coreutils-8.21-patch0.5/src/mv.c
-*** coreutils-8.21/src/mv.c 2013-02-07 10:37:05.000000000 +0100
---- coreutils-8.21-patch0.5/src/mv.c 2013-03-12 21:23:58.000000000 +0100
-***************
-*** 64,69 ****
---- 64,70 ----
- {"target-directory", required_argument, NULL, 't'},
- {"update", no_argument, NULL, 'u'},
- {"verbose", no_argument, NULL, 'v'},
-+ {"progress-bar", no_argument, NULL, 'g'},
- {GETOPT_HELP_OPTION_DECL},
- {GETOPT_VERSION_OPTION_DECL},
- {NULL, 0, NULL, 0}
-***************
-*** 165,171 ****
- bool copy_into_self;
- bool rename_succeeded;
- bool ok = copy (source, dest, false, x, ©_into_self, &rename_succeeded);
-!
- if (ok)
- {
- char const *dir_to_remove;
---- 166,172 ----
- bool copy_into_self;
- bool rename_succeeded;
- bool ok = copy (source, dest, false, x, ©_into_self, &rename_succeeded);
-!
- if (ok)
- {
- char const *dir_to_remove;
-***************
-*** 300,305 ****
---- 301,307 ----
- \n\
- -b like --backup but does not accept an argument\n\
- -f, --force do not prompt before overwriting\n\
-+ -g, --progress-bar add progress-bar\n\
- -i, --interactive prompt before overwrite\n\
- -n, --no-clobber do not overwrite an existing file\n\
- If you specify more than one of -i, -f, -n, only the final one takes effect.\n\
-***************
-*** 368,374 ****
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "bfint:uvS:T", long_options, NULL))
- != -1)
- {
- switch (c)
---- 370,376 ----
- we'll actually use backup_suffix_string. */
- backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-
-! while ((c = getopt_long (argc, argv, "bfint:uvgS:T", long_options, NULL))
- != -1)
- {
- switch (c)
-***************
-*** 414,419 ****
---- 416,424 ----
- case 'v':
- x.verbose = true;
- break;
-+ case 'g':
-+ progress = true;
-+ break;
- case 'S':
- make_backups = true;
- backup_suffix_string = optarg;
-***************
-*** 476,481 ****
---- 481,537 ----
- : no_backups);
-
- hash_init ();
-+
-+ /* BEGIN progress mod */
-+ struct timeval start_time;
-+
-+ if(progress) {
-+ g_iTotalSize = 0;
-+ g_iFilesCopied = 0;
-+ g_iTotalWritten = 0;
-+
-+ gettimeofday (& start_time, NULL);
-+ g_oStartTime = start_time;
-+
-+ printf ("Calculating total size... \r");
-+ fflush (stdout);
-+ long iTotalSize = 0;
-+ int iFiles = n_files;
-+ if ( !target_directory )
-+ iFiles = 1;
-+ int j;
-+ for (j = 0; j < iFiles; j++)
-+ {
-+ /* call du -s for each file */
-+ /* create command */
-+ char command[1024];
-+ sprintf ( command, "du -s \"%s\"", file[j] );
-+ /* TODO: replace all quote signs in file[i] */
-+
-+ FILE *fp;
-+ char output[1024];
-+
-+ /* run command */
-+ fp = popen(command, "r");
-+ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
-+ printf("failed to run du.\n" );
-+ }
-+ else
-+ {
-+ /* isolate size */
-+ strchr ( output, '\t' )[0] = '\0';
-+ iTotalSize += atol ( output );
-+
-+ printf ( "Calculating total size... %ld\r", iTotalSize );
-+ fflush ( stdout );
-+ }
-+
-+ /* close */
-+ pclose(fp);
-+ }
-+ g_iTotalSize = iTotalSize;
-+ }
-+ /* END progress mod */
-
- if (target_directory)
- {
-***************
-*** 493,498 ****
---- 549,594 ----
- }
- else
- ok = movefile (file[0], file[1], false, &x);
-+
-+ /* BEGIN progress mod */
-+ if (progress) {
-+ /* remove everything */
-+ int i;
-+ if ( g_iTotalSize )
-+ {
-+ for ( i = 0; i < 6; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[6A" );
-+ }
-+ else
-+ {
-+ for ( i = 0; i < 3; i++ )
-+ printf ( "\033[K\n" );
-+ printf ( "\r\033[3A" );
-+ }
-+
-+ /* save time */
-+ struct timeval end_time;
-+ gettimeofday ( & end_time, NULL );
-+ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
-+ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
-+ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
-+
-+ /* get total size */
-+ char sTotalWritten[20];
-+ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
-+ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
-+
-+ /* calculate speed */
-+ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
-+ char s_copy_speed[20];
-+ file_size_format ( s_copy_speed, copy_speed, 1 );
-+
-+ /* good-bye message */
-+ printf ( "%d files (%s) moved in %.1f seconds (%s/s).\n", g_iFilesCopied, sTotalWritten,
-+ sec_elapsed, s_copy_speed );
-+ }
-+ /* END progress mod */
-
- exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
- }
+diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
+--- coreutils-9.0/src/copy.c 2021-09-24 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/copy.c 2022-03-27 05:54:15.840209369 +0530
+@@ -129,6 +129,133 @@
+ dev_t dev;
+ };
+
++/* BEGIN progress mod */
++struct progress_status {
++ int iCountDown;
++ char ** cProgressField;
++ struct timeval last_time;
++ int last_size, iBarLength;
++ struct stat src_open_sb;
++};
++
++FILE * spawn( const char *cmd, char *const argv[] )
++{
++ FILE *ret = NULL;
++ int pfd_read[2];
++ pid_t pid;
++
++ if (cmd == NULL || argv == NULL)
++ return ret;
++
++ if (pipe(pfd_read) < 0) {
++ error(0, errno, "pipe: %s", cmd);
++ return ret;
++ }
++
++ if ((pid = fork()) == 0) {
++ int err = dup2(pfd_read[1], 1) < 0;
++ close(pfd_read[0]);
++ close(pfd_read[1]);
++
++ if (err)
++ error(EXIT_FAILURE, errno, "dup2: %s", cmd);
++ execvp(cmd, argv);
++ error(EXIT_FAILURE, errno, "exec: %s", cmd);
++ }
++
++ close(pfd_read[1]);
++
++ if (pid < 0) {
++ close(pfd_read[0]);
++ error(0, errno, "fork: %s", cmd);
++ return ret;
++ }
++
++ ret = fdopen(pfd_read[0], "r");
++ return ret;
++}
++
++void format_time ( char * _cDest, double seconds, bool showall )
++{
++ // hours
++ int hr = ( (int) seconds / (60 * 60)) % 24;
++ // minutes
++ int min = ( (int) seconds / 60) % 60;
++ // seconds
++ double sec = seconds - (hr * (60 * 60)) - (min * 60);
++ if ( showall )
++ {
++ if ( seconds < 0 )
++ sprintf(_cDest, "%2ch %2cm %2cs", '0', '0', '?');
++ else
++ sprintf(_cDest, "%2dh %2dm %2ds", hr, min, (int) sec);
++ } else if ( seconds >= 3600 )
++ {
++ sprintf(_cDest, "%2dh %2dm %4.1fs", hr, min, sec);
++ } else if ( seconds >= 60 )
++ {
++ sprintf(_cDest, "%2dm %4.1fs", min, sec);
++ } else
++ {
++ sprintf(_cDest, "%4.1fs", sec);
++ }
++}
++
++static void file_progress_bar ( char * _cDest, int _iBarLength, long _lProgress, long _lTotal )
++{
++ double dPercent = (double) _lProgress / (double) _lTotal * 100.f;
++ sprintf( _cDest + ( _iBarLength - 6), "%4.1f", dPercent );
++ _cDest[_iBarLength - 2] = ' ';
++
++ int i;
++ for ( i=1; i<=_iBarLength - 9; i++)
++ {
++ if ( dPercent > (double) (i-1) / (_iBarLength - 10) * 100.f )
++ {
++ _cDest[i] = '=';
++ }
++ else
++ {
++ _cDest[i] = ' ';
++ }
++ }
++ for ( i=1; i<_iBarLength - 9; i++)
++ {
++ if ( ( _cDest[i+1] == ' ' ) && ( _cDest[i] == '=' ) )
++ _cDest[i] = '>' ;
++ }
++}
++
++int file_size_format ( char * _cDst, long _lSize, int _iCounter )
++{
++ int iCounter = _iCounter;
++ double dSize = ( double ) _lSize;
++ while ( dSize >= 1000. )
++ {
++ dSize /= 1024.;
++ iCounter++;
++ }
++
++ /* get unit */
++ char * sUnit;
++ if ( iCounter == 0 )
++ sUnit = "B";
++ else if ( iCounter == 1 )
++ sUnit = "KiB";
++ else if ( iCounter == 2 )
++ sUnit = "MiB";
++ else if ( iCounter == 3 )
++ sUnit = "GiB";
++ else if ( iCounter == 4 )
++ sUnit = "TiB";
++ else
++ sUnit = "N/A";
++
++ /* write number */
++ return sprintf ( _cDst, "%5.1f %s", dSize, sUnit );
++}
++/* END progress mod */
++
+ /* Initial size of the cp.dest_info hash table. */
+ #define DEST_INFO_INITIAL_CAPACITY 61
+
+@@ -299,14 +426,23 @@
+ bytes read. */
+ static bool
+ sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
+- size_t hole_size, bool punch_holes, bool allow_reflink,
++ size_t hole_size, bool punch_holes, bool allow_reflink, bool move_mode,
+ char const *src_name, char const *dst_name,
+ uintmax_t max_n_read, off_t *total_n_read,
+- bool *last_write_made_hole)
++ bool *last_write_made_hole,
++ struct progress_status *s_progress)
+ {
+ *last_write_made_hole = false;
+ *total_n_read = 0;
+
++ /* BEGIN progress mod */
++ gettimeofday ( & g_oFStartTime, NULL );
++ g_iFTotalWritten = 0;
++ struct stat st;
++ stat(src_name, &st);
++ g_iFTotalSize = st.st_size/1024;
++ /* END progress mod */
++
+ /* If not looking for holes, use copy_file_range if functional,
+ but don't use if reflink disallowed as that may be implicit. */
+ if ((! hole_size) && allow_reflink && functional_copy_file_range ())
+@@ -362,6 +498,103 @@
+
+ while (max_n_read)
+ {
++
++ /* BEGIN progress mod */
++ if (progress) {
++ /* update countdown */
++ s_progress->iCountDown--;
++ char * sProgressBar = s_progress->cProgressField[5];
++ if ( s_progress->iCountDown < 0 )
++ s_progress->iCountDown = 100;
++
++ /* just print one line with the percentage, but not always */
++ if ( s_progress->iCountDown == 0 )
++ {
++ /* calculate current speed */
++ struct timeval cur_time;
++ gettimeofday ( & cur_time, NULL );
++ int cur_size = g_iTotalWritten + *total_n_read / 1024;
++ int cur_fsize = g_iFTotalWritten + *total_n_read / 1024;
++ int usec_elapsed = cur_time.tv_usec - s_progress->last_time.tv_usec;
++ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++ sec_elapsed += ( double ) ( cur_time.tv_sec - s_progress->last_time.tv_sec );
++ int copy_speed = ( int ) ( ( double ) ( cur_size - s_progress->last_size )
++ / sec_elapsed );
++ char s_copy_speed[20];
++ file_size_format ( s_copy_speed, copy_speed >= 0 ? copy_speed : 0, 1 );
++ /* update vars */
++ s_progress->last_time = cur_time;
++ s_progress->last_size = cur_size;
++
++ /* how many time has passed since the start? */
++ int isec_elapsed = cur_time.tv_sec - g_oStartTime.tv_sec;
++ int isec_felapsed = cur_time.tv_sec - g_oFStartTime.tv_sec;
++ int sec_remaining = ( int ) ( ( double ) isec_elapsed / cur_size
++ * g_iTotalSize ) - isec_elapsed;
++ int sec_fremaining = ( int ) ( ( double ) isec_felapsed / cur_fsize
++ * g_iFTotalSize ) - isec_felapsed;
++ /* print out */
++
++ char f_ttime[20];
++ char f_ftime[20];
++ format_time(f_ttime, sec_remaining, true);
++ format_time(f_ftime, sec_fremaining, true);
++
++ sprintf ( s_progress->cProgressField[1],
++ move_mode
++ ? "%d of %d files moved (about %s remaining) "
++ : "%d of %d files copied (about %s remaining) ",
++ g_iFilesCopied, g_iTotalFiles, f_ttime );
++
++ char s_ftime[40] = "";
++
++ if (g_iTotalFiles > 1)
++ sprintf ( s_ftime, "(about %s remaining)", f_ftime );
++ else
++ sprintf ( s_ftime, "(about %s remaining)", f_ttime );
++
++ sprintf ( s_progress->cProgressField[3],
++ move_mode
++ ? "moving at %s/s %s"
++ : "copying at %s/s %s", s_copy_speed, s_ftime );
++
++ int fs_len;
++ if ( g_iTotalFiles > 1 )
++ {
++ /* global progress bar */
++ file_progress_bar ( s_progress->cProgressField[2], s_progress->iBarLength,
++ g_iTotalWritten + *total_n_read / 1024, g_iTotalSize );
++
++ /* print the global status */
++ fs_len = file_size_format ( s_progress->cProgressField[1] + s_progress->iBarLength - 21,
++ g_iTotalWritten + *total_n_read / 1024, 1 );
++ s_progress->cProgressField[1][s_progress->iBarLength - 21 + fs_len] = ' ';
++ }
++
++ /* current progress bar */
++ file_progress_bar ( sProgressBar, s_progress->iBarLength, *total_n_read, s_progress->src_open_sb.st_size );
++
++ /* print the status */
++ fs_len = file_size_format ( s_progress->cProgressField[4] + s_progress->iBarLength - 21, *total_n_read, 0 );
++ s_progress->cProgressField[4][s_progress->iBarLength - 21 + fs_len] = ' ';
++
++ /* print the field */
++ int it;
++ for ( it = g_iTotalFiles>1 ? 0 : 3; it < 6; it++ )
++ {
++ printf ( "\033[K%s\n", s_progress->cProgressField[it] );
++ if ( strlen ( s_progress->cProgressField[it] ) < s_progress->iBarLength )
++ printf ( "%s", "" );
++ }
++ if ( g_iTotalFiles > 1 )
++ printf ( "\r\033[6A" );
++ else
++ printf ( "\r\033[3A" );
++ fflush ( stdout );
++ }
++ }
++ /* END progress mod */
++
+ ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
+ if (n_read < 0)
+ {
+@@ -446,6 +679,14 @@
+ certain files in /proc or /sys with linux kernels. */
+ }
+
++ /* BEGIN progress mod */
++ if (progress) {
++ /* update total size */
++ g_iTotalWritten += *total_n_read / 1024;
++ g_iFilesCopied++;
++ }
++ /* END progress mod */
++
+ /* Ensure a trailing hole is created, so that subsequent
+ calls of sparse_copy() start at the correct offset. */
+ if (make_hole && ! create_hole (dest_fd, dst_name, punch_holes, psize))
+@@ -516,9 +757,11 @@
+ static bool
+ lseek_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
+ size_t hole_size, off_t ext_start, off_t src_total_size,
+- enum Sparse_type sparse_mode,
++ enum Sparse_type sparse_mode, bool move_mode,
+ bool allow_reflink,
+- char const *src_name, char const *dst_name)
++ char const *src_name, char const *dst_name,
++ int iCountDown, char ** cProgressField, struct timeval last_time,
++ int last_size, int iBarLength, struct stat src_open_sb)
+ {
+ off_t last_ext_start = 0;
+ off_t last_ext_len = 0;
+@@ -590,10 +833,16 @@
+ is conservative and may miss some holes. */
+ off_t n_read;
+ bool read_hole;
++
++ struct timeval a;
++ struct stat b;
++
++ struct progress_status s_progress={iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
++
+ if ( ! sparse_copy (src_fd, dest_fd, buf, buf_size,
+ sparse_mode == SPARSE_NEVER ? 0 : hole_size,
+- true, allow_reflink, src_name, dst_name,
+- ext_len, &n_read, &read_hole))
++ true, allow_reflink, move_mode, src_name,
++ dst_name, ext_len, &n_read, &read_hole, &s_progress))
+ return false;
+
+ dest_pos = ext_start + n_read;
+@@ -1374,8 +1623,80 @@
+ buf_alloc = xmalloc (buf_size + buf_alignment);
+ buf = ptr_align (buf_alloc, buf_alignment);
+
++ /* BEGIN progress mod */
++ /* create a field of 6 lines */
++ char ** cProgressField = ( char ** ) calloc ( 6, sizeof ( char * ) );
++ /* get console width */
++ int iBarLength = 80;
++ struct winsize win;
++ if ( ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win) == 0 && win.ws_col > 0 )
++ if (win.ws_col > iBarLength) /* String printed may be longer on smaller screens */
++ iBarLength = win.ws_col;
++ /* create rows */
++ int it;
++ for ( it = 0; it < 6; it++ )
++ {
++ cProgressField[it] = ( char * ) malloc ( iBarLength + 1 );
++ /* init with spaces */
++ int j;
++ for ( j = 0; j < iBarLength; j++ )
++ cProgressField[it][j] = ' ';
++ cProgressField[it][iBarLength] = '\0';
++ }
++
++ /* global progress bar? */
++ if ( g_iTotalFiles > 1 )
++ {
++ /* init global progress bar */
++ cProgressField[2][0] = '[';
++ cProgressField[2][iBarLength - 8] = ']';
++ cProgressField[2][iBarLength - 7] = ' ';
++ cProgressField[2][iBarLength - 1] = '%';
++
++ /* total size */
++ cProgressField[1][iBarLength - 11] = '/';
++ file_size_format ( cProgressField[1] + iBarLength - 9, g_iTotalSize, 1 );
++
++ /* show how many files were written */
++ int sum_length = 0;
++ sum_length = sprintf ( cProgressField[1],
++ x->move_mode
++ ? "%d of %d files moved so far"
++ : "%d of %d files copied so far", g_iFilesCopied, g_iTotalFiles );
++ cProgressField[1][sum_length] = ' ';
++ }
++
++ /* truncate filename? */
++ int fn_length;
++ if ( strlen ( src_name ) > iBarLength - 22 )
++ fn_length =
++ sprintf ( cProgressField[4], "...%s", src_name + ( strlen ( src_name ) - iBarLength + 25 ) );
++ else
++ fn_length = sprintf ( cProgressField[4], "%s", src_name );
++ cProgressField[4][fn_length] = ' ';
++
++ /* filesize */
++ cProgressField[4][iBarLength - 11] = '/';
++ file_size_format ( cProgressField[4] + iBarLength - 9, src_open_sb.st_size, 0 );
++
++ int iCountDown = 1;
++ char * sProgressBar = cProgressField[5];
++ sProgressBar[0] = '[';
++ sProgressBar[iBarLength - 8] = ']';
++ sProgressBar[iBarLength - 7] = ' ';
++ sProgressBar[iBarLength - 1] = '%';
++
++ /* this will always save the time in between */
++ struct timeval last_time;
++ gettimeofday ( & last_time, NULL );
++ int last_size = g_iTotalWritten;
++ /* END progress mod */
++
+ off_t n_read;
+ bool wrote_hole_at_eof = false;
++
++ struct progress_status s_progress = { iCountDown, cProgressField, last_time, last_size, iBarLength, src_open_sb};
++
+ if (! (
+ #ifdef SEEK_HOLE
+ scantype == LSEEK_SCANTYPE
+@@ -1383,15 +1704,17 @@
+ scan_inference.ext_start, src_open_sb.st_size,
+ make_holes ? x->sparse_mode : SPARSE_NEVER,
+ x->reflink_mode != REFLINK_NEVER,
+- src_name, dst_name)
++ x->move_mode, src_name, dst_name,
++ iCountDown, cProgressField, last_time, last_size,
++ iBarLength, src_open_sb)
+ :
+ #endif
+ sparse_copy (source_desc, dest_desc, buf, buf_size,
+ make_holes ? hole_size : 0,
+ x->sparse_mode == SPARSE_ALWAYS,
+ x->reflink_mode != REFLINK_NEVER,
+- src_name, dst_name, UINTMAX_MAX, &n_read,
+- &wrote_hole_at_eof)))
++ x->move_mode, src_name, dst_name, UINTMAX_MAX,
++ &n_read, &wrote_hole_at_eof, &s_progress)))
+ {
+ return_val = false;
+ goto close_src_and_dst_desc;
+@@ -1402,6 +1725,14 @@
+ return_val = false;
+ goto close_src_and_dst_desc;
+ }
++ /* BEGIN progress mod */
++ if (progress) {
++ int i;
++ for ( i = 0; i < 6; i++ )
++ free ( cProgressField[i] );
++ free ( cProgressField );
++ }
++ /* END progress mod */
+ }
+
+ if (x->preserve_timestamps)
+diff -aur coreutils-9.0/src/copy.h coreutils-9.0-patched/src/copy.h
+--- coreutils-9.0/src/copy.h 2021-09-24 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/copy.h 2022-03-27 05:54:15.844209471 +0530
+@@ -236,6 +236,9 @@
+ Create destination directories as usual. */
+ bool symbolic_link;
+
++ /* If true, draw a nice progress bar on screen */
++ bool progress_bar;
++
+ /* If true, do not copy a nondirectory that has an existing destination
+ with the same or newer modification time. */
+ bool update;
+@@ -308,4 +311,22 @@
+ bool chown_failure_ok (struct cp_options const *) _GL_ATTRIBUTE_PURE;
+ mode_t cached_umask (void);
+
++/* BEGIN progress mod */
++FILE * spawn( const char *cmd, char *const argv[] );
++void format_time ( char * _cDst, double seconds, bool showall );
++
++int file_size_format ( char * _cDst, long _lSize, int _iCounter );
++
++__attribute__((__common__)) long g_iTotalSize;
++__attribute__((__common__)) long g_iFTotalSize;
++__attribute__((__common__)) long g_iTotalWritten;
++__attribute__((__common__)) long g_iFTotalWritten;
++__attribute__((__common__)) int g_iFilesCopied;
++__attribute__((__common__)) int g_iDirectoriesCopied;
++__attribute__((__common__)) struct timeval g_oStartTime;
++__attribute__((__common__)) struct timeval g_oFStartTime;
++__attribute__((__common__)) int g_iTotalFiles;
++__attribute__((__common__)) bool progress;
++/* END progress mod */
++
+ #endif
+diff -aur coreutils-9.0/src/cp.c coreutils-9.0-patched/src/cp.c
+--- coreutils-9.0/src/cp.c 2021-09-24 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/cp.c 2022-03-27 06:28:53.896713403 +0530
+@@ -131,6 +131,7 @@
+ {"symbolic-link", no_argument, NULL, 's'},
+ {"target-directory", required_argument, NULL, 't'},
+ {"update", no_argument, NULL, 'u'},
++ {"progress-bar", no_argument, NULL, 'g'},
+ {"verbose", no_argument, NULL, 'v'},
+ {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
+ {GETOPT_HELP_OPTION_DECL},
+@@ -170,6 +171,9 @@
+ -f, --force if an existing destination file cannot be\n\
+ opened, remove it and try again (this option\n\
+ is ignored when the -n option is also used)\n\
++ -g, --progress-bar add a progress bar.\n\
++ Note that this doesn't work with reflink,\n\
++ reflink will be automatically disabled\n\
+ -i, --interactive prompt before overwrite (overrides a previous -n\
+ \n\
+ option)\n\
+@@ -634,6 +638,82 @@
+ die (EXIT_FAILURE, 0, _("target %s is not a directory"),
+ quoteaf (file[n_files - 1]));
+ }
++ /* BEGIN progress mod */
++ struct timeval start_time;
++ if (progress) {
++ if (g_iTotalSize == 0)
++ g_iTotalSize = 0;
++ if (g_iTotalFiles == 0)
++ g_iTotalFiles = n_files;
++ if (g_iFilesCopied == 0)
++ g_iFilesCopied = 0;
++ if (g_iDirectoriesCopied == 0)
++ g_iDirectoriesCopied = 0;
++ if (g_iTotalWritten == 0)
++ g_iTotalWritten = 0;
++
++ if (target_directory_operand (file[0], &sb, &new_dst, forcing))
++ g_iDirectoriesCopied++;
++
++ /* save time */
++ gettimeofday ( & start_time, NULL );
++ g_oStartTime = start_time;
++
++ printf ( "calculating total size... \r" );
++ fflush ( stdout );
++ long iTotalSize = 0;
++ int iFiles = n_files;
++ if ( ! target_directory )
++ iFiles = n_files - 1;
++ int j;
++
++ /* how many files are we copying */
++ FILE *fp ;
++ char output[1024];
++ fp = spawn("find", (char *[]){ "find", file[0], "-type", "f", NULL });
++ if ( fp == NULL)
++ printf("failed to run find\r");
++ else
++ {
++ char *line_buf = NULL;
++ size_t line_buf_size = 0;
++ int line_count = 0;
++ ssize_t line_size;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ while (line_size > 0)
++ {
++ line_count++;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ }
++ free (line_buf);
++ if ( line_count > n_files )
++ g_iTotalFiles = line_count;
++ }
++
++ for (j = 0; j < iFiles; j++)
++ {
++ /* call du -s for each file */
++ fp = spawn("du", (char *[]){ "du", "-s", file[j], NULL });
++ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
++ printf("failed to run du\r" );
++ }
++ else
++ {
++ /* isolate size */
++ strchr ( output, '\t' )[0] = '\0';
++ iTotalSize += atol ( output );
++
++ printf ( "calculating total size... %ld\r", iTotalSize );
++ fflush ( stdout );
++ }
++
++ /* close */
++ pclose(fp);
++ }
++ g_iTotalSize += iTotalSize;
++ }
++ /* END progress mod */
++
+
+ if (target_directory)
+ {
+@@ -781,6 +861,56 @@
+ ok = copy (source, new_dest, 0, x, &unused, NULL);
+ }
+
++ /* BEGIN progress mod */
++ if (progress) {
++ /* remove everything */
++ int i;
++ if ( g_iTotalFiles > 1 )
++ {
++ for ( i = 0; i < 6; i++ )
++ printf ( "\033[K\n" );
++ printf ( "\r\033[6A" );
++ }
++ else
++ {
++ for ( i = 0; i < 3; i++ )
++ printf ( "\033[K\n" );
++ printf ( "\r\033[3A" );
++ }
++
++ /* save time */
++ struct timeval end_time;
++ gettimeofday ( & end_time, NULL );
++ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
++ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
++
++ /* get total size */
++ char sTotalWritten[20];
++ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
++ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
++
++ /* calculate speed */
++ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
++ char s_copy_speed[20];
++ file_size_format ( s_copy_speed, copy_speed, 1 );
++
++ /* good-bye message */
++ char sFType[20];
++ if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied == g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)" );
++ else if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied < g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)/file(s)" );
++ else
++ sprintf ( sFType, "%s", "file(s)" );
++
++ char f_time[20];
++ format_time(f_time, sec_elapsed, false);
++ printf ( "%d %s (%s) copied in %s (%s/s).\n", g_iFilesCopied, sFType,
++ sTotalWritten, f_time, s_copy_speed );
++ }
++ /* END progress mod */
++
+ return ok;
+ }
+
+@@ -816,6 +946,9 @@
+ x->recursive = false;
+ x->sparse_mode = SPARSE_AUTO;
+ x->symbolic_link = false;
++
++ x->progress_bar = false;
++
+ x->set_mode = false;
+ x->mode = 0;
+
+@@ -954,7 +1087,8 @@
+ selinux_enabled = (0 < is_selinux_enabled ());
+ cp_option_init (&x);
+
+- while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:TZ",
++ /* BEGIN and END progress mod - remove the g in the next line!*/
++ while ((c = getopt_long (argc, argv, "abdfgHilLnprst:uvxPRS:TZ",
+ long_opts, NULL))
+ != -1)
+ {
+@@ -1011,6 +1145,10 @@
+ x.unlink_dest_after_failed_open = true;
+ break;
+
++ case 'g':
++ progress = true;
++ break;
++
+ case 'H':
+ x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
+ break;
+@@ -1171,6 +1309,9 @@
+ usage (EXIT_FAILURE);
+ }
+
++ if (progress)
++ x.reflink_mode = REFLINK_NEVER;
++
+ x.backup_type = (make_backups
+ ? xget_version (_("backup type"),
+ version_control_string)
+diff -aur coreutils-9.0/src/mv.c coreutils-9.0-patched/src/mv.c
+--- coreutils-9.0/src/mv.c 2021-09-24 17:01:05.000000000 +0530
++++ coreutils-9.0-patched/src/mv.c 2022-03-27 06:38:49.800838574 +0530
+@@ -66,6 +66,7 @@
+ {"target-directory", required_argument, NULL, 't'},
+ {"update", no_argument, NULL, 'u'},
+ {"verbose", no_argument, NULL, 'v'},
++ {"progress-bar", no_argument, NULL, 'g'},
+ {GETOPT_HELP_OPTION_DECL},
+ {GETOPT_VERSION_OPTION_DECL},
+ {NULL, 0, NULL, 0}
+@@ -170,8 +171,128 @@
+ {
+ bool copy_into_self;
+ bool rename_succeeded;
++
++ /* BEGIN progress mod */
++ struct timeval start_time;
++
++ if (progress && x->rename_errno != 0) {
++ if (g_iTotalSize == 0)
++ g_iTotalSize = 0;
++ if (g_iTotalFiles == 0)
++ g_iTotalFiles = 0;
++ if (g_iFilesCopied == 0)
++ g_iFilesCopied = 0;
++ if (g_iDirectoriesCopied == 0)
++ g_iDirectoriesCopied = 0;
++ if (g_iTotalWritten == 0)
++ g_iTotalWritten = 0;
++
++ if (target_directory_operand (source))
++ g_iDirectoriesCopied++;
++
++ gettimeofday (& start_time, NULL);
++ g_oStartTime = start_time;
++
++ /* how many files are we copying */
++ FILE *fp ;
++ char output[1024];
++ fp = spawn("find", (char *[]){ "find", (char *)source, "-type", "f", NULL });
++ if ( fp == NULL)
++ printf("failed to run find\r");
++ else
++ {
++ char *line_buf = NULL;
++ size_t line_buf_size = 0;
++ int line_count = 0;
++ ssize_t line_size;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ while (line_size > 0)
++ {
++ line_count++;
++ line_size = getline(&line_buf, &line_buf_size, fp);
++ }
++ free (line_buf);
++ g_iTotalFiles = line_count;
++ }
++ /* close */
++ pclose(fp);
++
++ printf ("calculating total size... \r");
++ fflush (stdout);
++ long iTotalSize = 0;
++ /* call du -s for source */
++ fp = spawn("du", (char *[]){ "du", "-s", (unsigned char *)(size_t)source, NULL });
++ if (fp == NULL || fgets(output, sizeof(output)-1, fp) == NULL) {
++ printf("failed to run du\r" );
++ }
++ else
++ {
++ /* isolate size */
++ strchr ( output, '\t' )[0] = '\0';
++ iTotalSize += atol ( output );
++ printf ( "calculating total size... %ld\r", iTotalSize );
++ fflush ( stdout );
++ }
++
++ /* close */
++ pclose(fp);
++ g_iTotalSize += iTotalSize;
++ }
++ /* END progress mod */
++
+ bool ok = copy (source, dest, false, x, ©_into_self, &rename_succeeded);
+
++ /* BEGIN progress mod */
++ if (progress && (x->rename_errno != 0 && ok)) {
++ /* remove everything */
++ int i;
++ int limit = (g_iTotalFiles > 1 ? 6 : 3);
++ if (!rename_succeeded)
++ {
++ for ( i = 0; i < limit; i++ )
++ printf ( "\033[K\n" );
++ printf ( "\r\033[3A" );
++ }
++
++ /* save time */
++ struct timeval end_time;
++ gettimeofday ( & end_time, NULL );
++ int usec_elapsed = end_time.tv_usec - start_time.tv_usec;
++ double sec_elapsed = ( double ) usec_elapsed / 1000000.f;
++ sec_elapsed += ( double ) ( end_time.tv_sec - start_time.tv_sec );
++
++ /* get total size */
++ char sTotalWritten[20];
++ file_size_format ( sTotalWritten, g_iTotalSize, 1 );
++ /* TODO: using g_iTotalWritten would be more correct, but is less accurate */
++
++ /* calculate speed */
++ int copy_speed = ( int ) ( ( double ) g_iTotalWritten / sec_elapsed );
++ char s_copy_speed[20];
++ file_size_format ( s_copy_speed, copy_speed, 1 );
++
++ /* increase counter */
++ g_iFilesCopied++;
++
++ /* good-bye message */
++ if ( x->last_file )
++ {
++ char sFType[20];
++ if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied == g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)" );
++ else if ( g_iDirectoriesCopied > 0 && g_iDirectoriesCopied < g_iFilesCopied )
++ sprintf ( sFType, "%s", "folder(s)/file(s)" );
++ else
++ sprintf ( sFType, "%s", "file(s)" );
++
++ char f_time[20];
++ format_time(f_time, sec_elapsed, false);
++ printf ( "%d %s (%s) moved in %s (%s/s).\n", g_iFilesCopied, sFType,
++ sTotalWritten, f_time, s_copy_speed );
++ }
++ }
++ /* END progress mod */
++
+ if (ok)
+ {
+ char const *dir_to_remove;
+@@ -306,6 +427,7 @@
+ \n\
+ -b like --backup but does not accept an argument\n\
+ -f, --force do not prompt before overwriting\n\
++ -g, --progress-bar add progress-bar\n\
+ -i, --interactive prompt before overwrite\n\
+ -n, --no-clobber do not overwrite an existing file\n\
+ If you specify more than one of -i, -f, -n, only the final one takes effect.\n\
+@@ -361,7 +483,7 @@
+ /* Try to disable the ability to unlink a directory. */
+ priv_set_remove_linkdir ();
+
+- while ((c = getopt_long (argc, argv, "bfint:uvS:TZ", long_options, NULL))
++ while ((c = getopt_long (argc, argv, "bfint:uvgS:TZ", long_options, NULL))
+ != -1)
+ {
+ switch (c)
+@@ -407,6 +529,9 @@
+ case 'v':
+ x.verbose = true;
+ break;
++ case 'g':
++ progress = true;
++ break;
+ case 'S':
+ make_backups = true;
+ backup_suffix = optarg;
/* Static attributes determined during input. */
-- const char *text; /* the text of the word */
+- char const *text; /* the text of the word */
- int length; /* length of this word */
-+ const wchar_t *text; /* the text of the word */
++ wchar_t const *text; /* the text of the word */
+ int length; /* length of this word, in characters */
+ int width; /* width of this word, in columns */
int space; /* the size of the following space */
};
@@ -154,16 +175,16 @@
static void set_prefix (char *p);
- static void fmt (FILE *f);
+ static bool fmt (FILE *f, char const *);
static bool get_paragraph (FILE *f);
-static int get_line (FILE *f, int c);
-static int get_prefix (FILE *f);
+static int sentence_space;
+
/* Prefix minus leading and trailing spaces (default ""). */
--static const char *prefix;
+-static char const *prefix;
+static wchar_t *prefix;
/* User-supplied maximum line width (default WIDTH). The only output
+ *s = L'\0';
}
- /* read file F and send formatted output to stdout. */
+ /* Read F and send formatted output to stdout.
@@ -550,24 +587,24 @@
static bool
get_paragraph (FILE *f)
+static wint_t
+copy_rest (FILE *f, wint_t c)
{
-- const char *s;
-+ const wchar_t *s;
+- char const *s;
++ wchar_t const *s;
out_column = 0;
- if (in_column > next_prefix_indent || (c != '\n' && c != EOF))
prefix_lead_space : in_column;
else
{
-- const char *p;
-+ const wchar_t *p;
+- char const *p;
++ wchar_t const *p;
next_prefix_indent = in_column;
- for (p = prefix; *p != '\0'; p++)
+ for (p = prefix; *p != L'\0'; p++)
static void
put_word (WORD *w)
{
-- const char *s;
-+ const wchar_t *s;
+- char const *s;
++ wchar_t const *s;
int n;
s = w->text;
---- coreutils-8.31/doc/coreutils.texi.orig 2019-03-07 06:59:27.000000000 +0100
-+++ coreutils-8.31/doc/coreutils.texi 2019-05-31 16:57:00.439962635 +0200
+--- coreutils-9.0/doc/coreutils.texi.orig 2021-09-24 13:31:05.000000000 +0200
++++ coreutils-9.0/doc/coreutils.texi 2021-10-07 17:55:04.486617755 +0200
@@ -22,123 +22,112 @@
@syncodeindex pg cp
@syncodeindex vr cp
+* Coreutils: (coreutils). Core GNU (file, text, shell) utilities
* Common options: (coreutils)Common options.
-* File permissions: (coreutils)File permissions. Access modes.
-+* File permissions: (coreutils)File permissions. Access modes
++* File permissions: (coreutils)File permissions. Access modes.
* Date input formats: (coreutils)Date input formats.
-@end direntry
-
-* cut: (coreutils)cut invocation. Print selected parts of lines.
-* date: (coreutils)date invocation. Print/set system date and time.
-* dd: (coreutils)dd invocation. Copy and convert a file.
--* df: (coreutils)df invocation. Report file system disk usage.
+-* df: (coreutils)df invocation. Report file system usage.
-* dir: (coreutils)dir invocation. List directories briefly.
-* dircolors: (coreutils)dircolors invocation. Color setup for ls.
-* dirname: (coreutils)dirname invocation. Strip last file name component.
--* du: (coreutils)du invocation. Report on disk usage.
+-* du: (coreutils)du invocation. Report file usage.
-* echo: (coreutils)echo invocation. Print a line of text.
-* env: (coreutils)env invocation. Modify the environment.
-* expand: (coreutils)expand invocation. Convert tabs to spaces.
-* stdbuf: (coreutils)stdbuf invocation. Modify stdio buffering.
-* stty: (coreutils)stty invocation. Print/change terminal settings.
-* sum: (coreutils)sum invocation. Print traditional checksum.
--* sync: (coreutils)sync invocation. Synchronize memory to disk.
+-* sync: (coreutils)sync invocation. Sync files to stable storage.
-* tac: (coreutils)tac invocation. Reverse files.
-* tail: (coreutils)tail invocation. Output the last part of files.
-* tee: (coreutils)tee invocation. Redirect to multiple files.
-* who: (coreutils)who invocation. Print who is logged in.
-* whoami: (coreutils)whoami invocation. Print effective user ID.
-* yes: (coreutils)yes invocation. Print a string indefinitely.
-+* arch: (coreutils)arch. Print machine hardware name
-+* b2sum: (coreutils)b2sum. Print or check BLAKE2 digests
-+* base32: (coreutils)base32. Base32 encode/decode data
-+* base64: (coreutils)base64. Base64 encode/decode data
-+* basename: (coreutils)basename. Strip directory and suffix
-+* basenc: (coreutils)basenc. Encoding/decoding of data
-+* cat: (coreutils)cat. Concatenate and write files
-+* chcon: (coreutils)chcon. Change SELinux CTX of files
-+* chgrp: (coreutils)chgrp. Change file groups
-+* chmod: (coreutils)chmod. Change access permissions
-+* chown: (coreutils)chown. Change file owners and groups
-+* chroot: (coreutils)chroot. Specify the root directory
-+* cksum: (coreutils)cksum. Print POSIX CRC checksum
-+* comm: (coreutils)comm. Compare sorted files by line
-+* cp: (coreutils)cp. Copy files
-+* csplit: (coreutils)csplit. Split by context
-+* cut: (coreutils)cut. Print selected parts of lines
-+* date: (coreutils)date. Print/set system date and time
-+* dd: (coreutils)dd. Copy and convert a file
-+* df: (coreutils)df. Report file system disk usage
-+* dir: (coreutils)dir. List directories briefly
-+* dircolors: (coreutils)dircolors. Color setup for ls
-+* dirname: (coreutils)dirname. Strip last file name component
-+* du: (coreutils)du. Report on disk usage
-+* echo: (coreutils)echo. Print a line of text
-+* env: (coreutils)env. Modify the environment
-+* expand: (coreutils)expand. Convert tabs to spaces
-+* expr: (coreutils)expr. Evaluate expressions
++* arch: (coreutils)arch. Print machine hardware name.
++* b2sum: (coreutils)b2sum. Print or check BLAKE2 digests.
++* base32: (coreutils)base32. Base32 encode/decode data.
++* base64: (coreutils)base64. Base64 encode/decode data.
++* basename: (coreutils)basename. Strip directory and suffix.
++* basenc: (coreutils)basenc. Encoding/decoding of data.
++* cat: (coreutils)cat. Concatenate and write files.
++* chcon: (coreutils)chcon. Change SELinux CTX of files.
++* chgrp: (coreutils)chgrp. Change file groups.
++* chmod: (coreutils)chmod. Change access permissions.
++* chown: (coreutils)chown. Change file owners and groups.
++* chroot: (coreutils)chroot. Specify the root directory.
++* cksum: (coreutils)cksum. Print POSIX CRC checksum.
++* comm: (coreutils)comm. Compare sorted files by line.
++* cp: (coreutils)cp. Copy files.
++* csplit: (coreutils)csplit. Split by context.
++* cut: (coreutils)cut. Print selected parts of lines.
++* date: (coreutils)date. Print/set system date and time.
++* dd: (coreutils)dd. Copy and convert a file.
++* df: (coreutils)df. Report file system usage.
++* dir: (coreutils)dir. List directories briefly.
++* dircolors: (coreutils)dircolors. Color setup for ls.
++* dirname: (coreutils)dirname. Strip last file name component.
++* du: (coreutils)du. Report file usage.
++* echo: (coreutils)echo. Print a line of text.
++* env: (coreutils)env. Modify the environment.
++* expand: (coreutils)expand. Convert tabs to spaces.
++* expr: (coreutils)expr. Evaluate expressions.
+* factor: (coreutils)factor. Print prime factors
-+* false: (coreutils)false. Do nothing, unsuccessfully
-+* fmt: (coreutils)fmt. Reformat paragraph text
-+* fold: (coreutils)fold. Wrap long input lines
-+* groups: (coreutils)groups. Print group names a user is in
-+* head: (coreutils)head. Output the first part of files
-+* hostid: (coreutils)hostid. Print numeric host identifier
-+* id: (coreutils)id. Print user identity
-+* install: (coreutils)install. Copy files and set attributes
-+* join: (coreutils)join. Join lines on a common field
-+* link: (coreutils)link. Make hard links between files
-+* ln: (coreutils)ln. Make links between files
-+* logname: (coreutils)logname. Print current login name
-+* ls: (coreutils)ls. List directory contents
-+* md5sum: (coreutils)md5sum. Print or check MD5 digests
-+* mkdir: (coreutils)mkdir. Create directories
-+* mkfifo: (coreutils)mkfifo. Create FIFOs (named pipes)
-+* mknod: (coreutils)mknod. Create special files
-+* mktemp: (coreutils)mktemp. Create temporary files
-+* mv: (coreutils)mv. Rename files
-+* nice: (coreutils)nice. Modify niceness
-+* nl: (coreutils)nl. Number lines and write files
-+* nohup: (coreutils)nohup. Immunize to hangups
-+* nproc: (coreutils)nproc. Print the number of processors
-+* numfmt: (coreutils)numfmt. Reformat numbers
++* false: (coreutils)false. Do nothing, unsuccessfully.
++* fmt: (coreutils)fmt. Reformat paragraph text.
++* fold: (coreutils)fold. Wrap long input lines.
++* groups: (coreutils)groups. Print group names a user is in.
++* head: (coreutils)head. Output the first part of files.
++* hostid: (coreutils)hostid. Print numeric host identifier.
++* id: (coreutils)id. Print user identity.
++* install: (coreutils)install. Copy files and set attributes.
++* join: (coreutils)join. Join lines on a common field.
++* link: (coreutils)link. Make hard links between files.
++* ln: (coreutils)ln. Make links between files.
++* logname: (coreutils)logname. Print current login name.
++* ls: (coreutils)ls. List directory contents.
++* md5sum: (coreutils)md5sum. Print or check MD5 digests.
++* mkdir: (coreutils)mkdir. Create directories.
++* mkfifo: (coreutils)mkfifo. Create FIFOs (named pipes).
++* mknod: (coreutils)mknod. Create special files.
++* mktemp: (coreutils)mktemp. Create temporary files.
++* mv: (coreutils)mv. Rename files.
++* nice: (coreutils)nice. Modify niceness.
++* nl: (coreutils)nl. Number lines and write files.
++* nohup: (coreutils)nohup. Immunize to hangups.
++* nproc: (coreutils)nproc. Print the number of processors.
++* numfmt: (coreutils)numfmt. Reformat numbers.
+* od: (coreutils)od. Dump files in octal, etc.
-+* paste: (coreutils)paste. Merge lines of files
-+* pathchk: (coreutils)pathchk. Check file name portability
-+* pr: (coreutils)pr. Paginate or columnate files
-+* printenv: (coreutils)printenv. Print environment variables
-+* printf: (coreutils)printf. Format and print data
-+* ptx: (coreutils)ptx. Produce permuted indexes
-+* pwd: (coreutils)pwd. Print working directory
-+* readlink: (coreutils)readlink. Print referent of a symlink
-+* realpath: (coreutils)realpath. Print resolved file names
-+* rm: (coreutils)rm. Remove files
-+* rmdir: (coreutils)rmdir. Remove empty directories
-+* runcon: (coreutils)runcon. Run in specified SELinux CTX
++* paste: (coreutils)paste. Merge lines of files.
++* pathchk: (coreutils)pathchk. Check file name portability.
++* pr: (coreutils)pr. Paginate or columnate files.
++* printenv: (coreutils)printenv. Print environment variables.
++* printf: (coreutils)printf. Format and print data.
++* ptx: (coreutils)ptx. Produce permuted indexes.
++* pwd: (coreutils)pwd. Print working directory.
++* readlink: (coreutils)readlink. Print referent of a symlink.
++* realpath: (coreutils)realpath. Print resolved file names.
++* rm: (coreutils)rm. Remove files.
++* rmdir: (coreutils)rmdir. Remove empty directories.
++* runcon: (coreutils)runcon. Run in specified SELinux CTX.
+* seq: (coreutils)seq. Print numeric sequences
-+* sha1sum: (coreutils)sha1sum. Print or check SHA-1 digests
-+* sha2: (coreutils)sha2 utilities. Print or check SHA-2 digests
-+* shred: (coreutils)shred. Remove files more securely
-+* shuf: (coreutils)shuf. Shuffling text files
-+* sleep: (coreutils)sleep. Delay for a specified time
-+* sort: (coreutils)sort. Sort text files
-+* split: (coreutils)split. Split into pieces
-+* stat: (coreutils)stat. Report file(system) status
-+* stdbuf: (coreutils)stdbuf. Modify stdio buffering
-+* stty: (coreutils)stty. Print/change terminal settings
-+* sum: (coreutils)sum. Print traditional checksum
-+* sync: (coreutils)sync. Synchronize memory to disk
-+* tac: (coreutils)tac. Reverse files
-+* tail: (coreutils)tail. Output the last part of files
-+* tee: (coreutils)tee. Redirect to multiple files
-+* test: (coreutils)test. File/string tests
-+* timeout: (coreutils)timeout. Run with time limit
-+* touch: (coreutils)touch. Change file timestamps
-+* tr: (coreutils)tr. Translate characters
-+* true: (coreutils)true. Do nothing, successfully
-+* truncate: (coreutils)truncate. Shrink/extend size of a file
-+* tsort: (coreutils)tsort. Topological sort
-+* tty: (coreutils)tty. Print terminal name
-+* uname: (coreutils)uname. Print system information
-+* unexpand: (coreutils)unexpand. Convert spaces to tabs
-+* uniq: (coreutils)uniq. Uniquify files
-+* unlink: (coreutils)unlink. Removal via unlink(2)
-+* users: (coreutils)users. Print current user names
-+* vdir: (coreutils)vdir. List directories verbosely
-+* wc: (coreutils)wc. Line, word, and byte counts
-+* who: (coreutils)who. Print who is logged in
-+* whoami: (coreutils)whoami. Print effective user ID
-+* yes: (coreutils)yes. Print a string indefinitely
++* sha1sum: (coreutils)sha1sum. Print or check SHA-1 digests.
++* sha2: (coreutils)sha2 utilities. Print or check SHA-2 digests.
++* shred: (coreutils)shred. Remove files more securely.
++* shuf: (coreutils)shuf. Shuffling text files.
++* sleep: (coreutils)sleep. Delay for a specified time.
++* sort: (coreutils)sort. Sort text files.
++* split: (coreutils)split. Split into pieces.
++* stat: (coreutils)stat. Report file(system) status.
++* stdbuf: (coreutils)stdbuf. Modify stdio buffering.
++* stty: (coreutils)stty. Print/change terminal settings.
++* sum: (coreutils)sum. Print traditional checksum.
++* sync: (coreutils)sync. Sync files to stable storage.
++* tac: (coreutils)tac. Reverse files.
++* tail: (coreutils)tail. Output the last part of files.
++* tee: (coreutils)tee. Redirect to multiple files.
++* test: (coreutils)test. File/string tests.
++* timeout: (coreutils)timeout. Run with time limit.
++* touch: (coreutils)touch. Change file timestamps.
++* tr: (coreutils)tr. Translate characters.
++* true: (coreutils)true. Do nothing, successfully.
++* truncate: (coreutils)truncate. Shrink/extend size of a file.
++* tsort: (coreutils)tsort. Topological sort.
++* tty: (coreutils)tty. Print terminal name.
++* uname: (coreutils)uname. Print system information.
++* unexpand: (coreutils)unexpand. Convert spaces to tabs.
++* uniq: (coreutils)uniq. Uniquify files.
++* unlink: (coreutils)unlink. Removal via unlink(2).
++* users: (coreutils)users. Print current user names.
++* vdir: (coreutils)vdir. List directories verbosely.
++* wc: (coreutils)wc. Line, word, and byte counts.
++* who: (coreutils)who. Print who is logged in.
++* whoami: (coreutils)whoami. Print effective user ID.
++* yes: (coreutils)yes. Print a string indefinitely.
@end direntry
@copying
-@@ -203,10 +192,9 @@
+@@ -203,10 +192,9 @@ Free Documentation License''.
* File name manipulation:: dirname basename pathchk mktemp realpath
* Working context:: pwd stty printenv tty
* User information:: id logname whoami groups users who
* Delaying:: sleep
* Numeric operations:: factor numfmt seq
* File permissions:: Access modes
-@@ -237,45 +225,45 @@
+@@ -238,45 +226,45 @@ Common Options
Output of entire files
@command{ptx}: Produce permuted indexes
-@@ -287,15 +275,15 @@
+@@ -288,15 +276,15 @@ Operating on sorted files
Operating on fields
@command{tr}: Translate, squeeze, and/or delete characters
-@@ -305,10 +293,10 @@
+@@ -306,10 +294,10 @@ Operating on characters
Directory listing
@command{ls}: List directory contents
-@@ -321,51 +309,51 @@
+@@ -321,51 +309,51 @@ Directory listing
Basic operations
+* chmod:: Change access permissions
+* touch:: Change file timestamps
- Disk usage
+ File space usage
--* df invocation:: Report file system disk space usage
+-* df invocation:: Report file system space usage
-* du invocation:: Estimate file space usage
-* stat invocation:: Report file or file system status
-* sync invocation:: Synchronize cached writes to persistent storage
-* truncate invocation:: Shrink or extend the size of a file
-+* df:: Report file system disk space usage
++* df:: Report file system space usage
+* du:: Estimate file space usage
+* stat:: Report file or file system status
+* sync:: Synchronize cached writes to persistent storage
@command{test}: Check file types and compare values
-@@ -384,22 +372,22 @@
+@@ -384,22 +372,22 @@ Conditions
Redirection
@command{stty}: Print or change terminal characteristics
-@@ -413,22 +401,20 @@
+@@ -413,22 +401,20 @@ Working context
User information
@command{date}: Print or set system date and time
-@@ -443,31 +429,27 @@
+@@ -443,31 +429,27 @@ System context
SELinux context
File timestamps
-@@ -1590,16 +1572,16 @@
+@@ -1597,16 +1579,16 @@ These commands read and write entire fil
in some way.
@menu
@section @command{cat}: Concatenate and write files
@pindex cat
-@@ -1700,7 +1682,7 @@
+@@ -1708,7 +1690,7 @@ cat
@end example
@section @command{tac}: Concatenate and write files in reverse
@pindex tac
-@@ -1758,7 +1740,7 @@
+@@ -1766,7 +1748,7 @@ tac -r -s 'x\|[^x]'
@end example
@section @command{nl}: Number lines and write files
@pindex nl
-@@ -1921,7 +1903,7 @@
+@@ -1934,7 +1916,7 @@ Use @var{number} characters for line num
@exitstatus
@section @command{od}: Write files in octal or other formats
@pindex od
-@@ -2187,7 +2169,7 @@
+@@ -2200,7 +2182,7 @@ address.
@exitstatus
@section @command{base32}: Transform data into printable data
@pindex base32
-@@ -2197,10 +2179,10 @@
+@@ -2210,10 +2192,10 @@ address.
into (or from) base32 encoded form. The base32 encoded form uses
printable ASCII characters to represent binary data.
The usage and options of this command are precisely the
@section @command{base64}: Transform data into printable data
@pindex base64
-@@ -2260,7 +2242,7 @@
+@@ -2273,7 +2255,7 @@ to permit distorted data to be decoded.
@exitstatus
@section @command{basenc}: Transform data into printable data
@pindex basenc
-@@ -2280,7 +2262,7 @@
- The @var{encoding} argument is required. If @var{file} is omitted,
- reads input from stdin. The @option{-w/--wrap},@option{-i/--ignore-garbage},
+@@ -2294,7 +2276,7 @@ The @var{encoding} argument is required.
+ @command{basenc} reads from standard input.
+ The @option{-w/--wrap},@option{-i/--ignore-garbage},
@option{-d/--decode} options of this command are precisely the same as
-for @command{base64}. @xref{base64 invocation}.
+for @command{base64}. @xref{base64}.
Supported @var{encoding}s are:
-@@ -2395,13 +2377,13 @@
+@@ -2409,13 +2391,13 @@ $ printf 01010100 | basenc --base2lsbf -
These commands reformat the contents of files.
@menu
@section @command{fmt}: Reformat paragraph text
@pindex fmt
-@@ -2505,7 +2487,7 @@
+@@ -2519,7 +2501,7 @@ leaving the code unchanged.
@exitstatus
@section @command{pr}: Paginate or columnate files for printing
@pindex pr
-@@ -2615,7 +2597,7 @@
+@@ -2629,7 +2611,7 @@ Double space the output.
@cindex time formats
@cindex formatting times
Format header dates using @var{format}, using the same conventions as
Except for directives, which start with
@samp{%}, characters in @var{format} are printed unchanged. You can use
this option to specify an arbitrary string in place of the header date,
-@@ -2845,7 +2827,7 @@
+@@ -2859,7 +2841,7 @@ line is never truncated.
@exitstatus
@section @command{fold}: Wrap input lines to fit in specified width
@pindex fold
-@@ -2912,13 +2894,13 @@
+@@ -2926,13 +2908,13 @@ instead.
These commands output pieces of the input.
@menu
@section @command{head}: Output the first part of files
@pindex head
-@@ -2997,7 +2979,7 @@
+@@ -3011,7 +2993,7 @@ avoid @command{head}, e.g., by using @sa
@exitstatus
@section @command{tail}: Output the last part of files
@pindex tail
-@@ -3247,7 +3229,7 @@
+@@ -3262,7 +3244,7 @@ mean either @samp{tail ./+4} or @samp{ta
@exitstatus
@section @command{split}: Split a file into pieces.
@pindex split
-@@ -3502,7 +3484,7 @@
+@@ -3517,7 +3499,7 @@ $ seq 100 > k; split -nl/7/33 k
@end example
@section @command{csplit}: Split a file into context-determined pieces
@pindex csplit
-@@ -3721,17 +3703,17 @@
+@@ -3736,17 +3718,17 @@ These commands generate just a few numbe
contents of files.
@menu
@section @command{wc}: Print newline, word, and byte counts
@pindex wc
-@@ -3852,7 +3834,7 @@
+@@ -3872,7 +3854,7 @@ find . -name '*.[ch]' -print0 |
@exitstatus
@section @command{sum}: Print checksum and block counts
@pindex sum
-@@ -3903,7 +3885,7 @@
+@@ -3921,7 +3903,7 @@ next section) is preferable in new appli
@exitstatus
-@node cksum invocation
+@node cksum
- @section @command{cksum}: Print CRC checksum and byte counts
+ @section @command{cksum}: Print and verify file checksums
@pindex cksum
-@@ -3937,7 +3919,7 @@
- @exitstatus
+@@ -3953,7 +3935,7 @@ for each file along with the number of b
+ and the file name unless no arguments were given.
+
+ The same usage and options as the @command{b2sum}
+-command are supported. @xref{b2sum invocation}.
++command are supported. @xref{b2sum}.
+ In addition @command{cksum} supports the following options.
+
+ @table @samp
+@@ -3996,11 +3978,11 @@ This format has the checksum at the star
+ more amenable to further processing by other utilities,
+ especially in combination with the @option{--zero} option.
+ Note this does not identify the digest algorithm used for the checksum.
+-@xref{md5sum invocation} for details of this format.
++@xref{md5sum} for details of this format.
+ @end table
-@node b2sum invocation
@section @command{b2sum}: Print or check BLAKE2 digests
@pindex b2sum
-@@ -3949,7 +3931,7 @@
+@@ -4012,7 +3994,7 @@ Note this does not identify the digest a
@command{b2sum} computes a 512-bit checksum for each specified
@var{file}. The same usage and options as the @command{md5sum}
In addition @command{b2sum} supports the following options.
@table @samp
-@@ -3964,7 +3946,7 @@
+@@ -4027,7 +4009,7 @@ This option is ignored when @option{--ch
as the length is automatically determined when checking.
@end table
@section @command{md5sum}: Print or check MD5 digests
@pindex md5sum
-@@ -3987,7 +3969,7 @@
+@@ -4050,7 +4032,7 @@ fingerprint is considered infeasible at
to modify certain files, including digital certificates, so that they
appear valid when signed with an \hash\ digest. For more secure hashes,
consider using SHA-2, or the newer @command{b2sum} command.
@end macro
@weakHash{MD5}
-@@ -4130,7 +4112,7 @@
+@@ -4208,7 +4190,7 @@ Also file name escaping is not used.
@exitstatus
@section @command{sha1sum}: Print or check SHA-1 digests
@pindex sha1sum
-@@ -4142,7 +4124,7 @@
+@@ -4220,7 +4202,7 @@ Also file name escaping is not used.
@command{sha1sum} computes a 160-bit checksum for each specified
@var{file}. The usage and options of this command are precisely the
@weakHash{SHA-1}
-@@ -4178,7 +4160,7 @@
+@@ -4256,7 +4238,7 @@ various lengths (respectively 224, 256,
collectively known as the SHA-2 hashes. The usage and options of
these commands are precisely the same as for @command{md5sum}
and @command{sha1sum}.
@node Operating on sorted files
-@@ -4190,16 +4172,16 @@
+@@ -4268,16 +4250,16 @@ and @command{sha1sum}.
These commands work with (or produce) sorted files.
@menu
@section @command{sort}: Sort text files
@pindex sort
-@@ -4489,7 +4471,7 @@
+@@ -4573,7 +4555,7 @@ appear earlier in the output instead of
Sort by hashing the input keys and then sorting the hash values.
Choose the hash function at random, ensuring that it is free of
collisions so that differing keys have differing hash values. This is
except that keys with the same value sort together.
If multiple random sort fields are specified, the same random hash
-@@ -4687,7 +4669,7 @@
+@@ -4771,7 +4753,7 @@ Set the number of sorts run in parallel
@var{n} is set to the number of available processors, but limited
to 8, as there are diminishing performance gains after that.
Note also that using @var{n} threads increases the memory usage by
@item -u
@itemx --unique
-@@ -4705,7 +4687,7 @@
+@@ -4789,7 +4771,7 @@ The commands @code{sort -u} and @code{so
this equivalence does not extend to arbitrary @command{sort} options.
For example, @code{sort -n -u} inspects only the value of the initial
numeric string when checking for uniqueness, whereas @code{sort -n |
@optZeroTerminated
@macro newlineFieldSeparator
-@@ -4918,7 +4900,7 @@
+@@ -5002,7 +4984,7 @@ ls */* | sort -t / -k 1,1R -k 2,2
@end itemize
@section @command{shuf}: Shuffling text
@pindex shuf
-@@ -5074,7 +5056,7 @@
+@@ -5158,7 +5140,7 @@ shuf -r -n 100 -e Head Tail
@exitstatus
@section @command{uniq}: Uniquify files
@pindex uniq
-@@ -5096,7 +5078,7 @@
+@@ -5180,7 +5162,7 @@ lines that are not repeated, or all repe
The input need not be sorted, but repeated input lines are detected
only if they are adjacent. If you want to discard non-adjacent
duplicate lines, perhaps you want to use @code{sort -u}.
@vindex LC_COLLATE
Comparisons honor the rules specified by the @env{LC_COLLATE}
-@@ -5261,7 +5243,7 @@
+@@ -5345,7 +5327,7 @@ compared.
@exitstatus
@section @command{comm}: Compare two sorted files line by line
@pindex comm
-@@ -5376,7 +5358,7 @@
+@@ -5460,7 +5442,7 @@ $ comm -12 file1 file2 | wc -l # numb
@end table
@section @command{ptx}: Produce permuted indexes
@pindex ptx
-@@ -5865,7 +5847,7 @@
+@@ -5950,7 +5932,7 @@ allowed with System V @command{ptx}.
@end itemize
@section @command{tsort}: Topological sort
@pindex tsort
-@@ -6027,13 +6009,13 @@
+@@ -6112,13 +6094,13 @@ in different ways.
@chapter Operating on fields
@menu
@section @command{cut}: Print selected parts of lines
@pindex cut
-@@ -6158,7 +6140,7 @@
+@@ -6243,7 +6225,7 @@ many fields and want to print all but a
@exitstatus
@section @command{paste}: Merge lines of files
@pindex paste
-@@ -6256,7 +6238,7 @@
+@@ -6341,7 +6323,7 @@ $ paste -d '%_' num2 let3 num2
@exitstatus
@section @command{join}: Join lines on a common field
@pindex join
-@@ -6788,13 +6770,13 @@
+@@ -6873,13 +6855,13 @@ entire lines as the key.
These commands operate on individual characters.
@menu
@section @command{tr}: Translate, squeeze, and/or delete characters
@pindex tr
-@@ -7177,7 +7159,7 @@
+@@ -7291,7 +7273,7 @@ square brackets from interpretation by a
@end itemize
@section @command{expand}: Convert tabs to spaces
@pindex expand
-@@ -7246,7 +7228,7 @@
+@@ -7360,7 +7342,7 @@ characters) on each line to spaces.
@exitstatus
@section @command{unexpand}: Convert spaces to tabs
@pindex unexpand
-@@ -7309,14 +7291,14 @@
+@@ -7423,14 +7405,14 @@ This chapter describes the @command{ls}
and @command{vdir}, which list information about files.
@menu
@section @command{ls}: List directory contents
@pindex ls
-@@ -8205,7 +8187,7 @@
+@@ -8325,7 +8307,7 @@ be one of the following:
@item +@var{format}
@vindex LC_TIME
List timestamps using @var{format}, where @var{format} is interpreted
-like the format argument of @command{date} (@pxref{date invocation}).
+like the format argument of @command{date} (@pxref{date}).
For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
- @command{ls} to list timestamps like @samp{2002-03-30 23:45:56}. As
+ @command{ls} to list timestamps like @samp{2020-03-30 23:45:56}. As
with @command{date}, @var{format}'s interpretation is affected by the
-@@ -8406,7 +8388,7 @@
+@@ -8526,7 +8508,7 @@ This is the default unless the output is
@end table
@section @command{dir}: Briefly list directory contents
@pindex dir
-@@ -8416,10 +8398,10 @@
+@@ -8536,10 +8518,10 @@ This is the default unless the output is
-b}; that is, by default files are listed in columns, sorted vertically,
and special characters are represented by backslash escape sequences.
@section @command{vdir}: Verbosely list directory contents
@pindex vdir
-@@ -8429,9 +8411,9 @@
+@@ -8549,9 +8531,9 @@ and special characters are represented b
-b}; that is, by default files are listed in long format and special
characters are represented by backslash escape sequences.
@section @command{dircolors}: Color setup for @command{ls}
@pindex dircolors
-@@ -8518,16 +8500,16 @@
+@@ -8638,16 +8620,16 @@ This chapter describes the commands for
copying, moving (renaming), and deleting (removing).
@menu
@section @command{cp}: Copy files and directories
@pindex cp
-@@ -9017,7 +8999,7 @@
+@@ -9142,7 +9124,7 @@ option, and overrides the @option{--pres
@exitstatus
@section @command{dd}: Convert and copy a file
@pindex dd
-@@ -9541,7 +9523,7 @@
+@@ -9683,7 +9665,7 @@ environment variable is set.
@exitstatus
@section @command{install}: Copy files and set attributes
@pindex install
-@@ -9723,7 +9705,7 @@
+@@ -9865,7 +9847,7 @@ This option is mutually exclusive with t
@exitstatus
@section @command{mv}: Move (rename) files
@pindex mv
-@@ -9869,7 +9851,7 @@
+@@ -10011,7 +9993,7 @@ to the system default type for destinati
@exitstatus
@section @command{rm}: Remove files or directories
@pindex rm
-@@ -10035,7 +10017,7 @@
+@@ -10177,7 +10159,7 @@ predates the development of the @code{ge
@exitstatus
@section @command{shred}: Remove files more securely
@pindex shred
-@@ -10055,7 +10055,7 @@ predates the development of the @code{ge
+@@ -10187,7 +10169,7 @@ predates the development of the @code{ge
@command{shred} overwrites devices or files, to help prevent even
extensive forensics from recovering the data.
and metadata are not actually destroyed. Only the file's directory
entry is removed, and the file's storage is reclaimed only when no
process has the file open and no other directory entry links to the
-@@ -10305,18 +10287,18 @@
+@@ -10474,18 +10456,18 @@ Besides directories, other special file
(FIFOs), symbolic links, sockets, and so-called @dfn{special files}.
@menu
@section @command{link}: Make a hard link via the link syscall
@pindex link
-@@ -10329,7 +10311,7 @@
+@@ -10498,7 +10480,7 @@ It is a minimalist interface to the syst
@code{link} function. @xref{Hard Links, , , libc,
The GNU C Library Reference Manual}.
It avoids the bells and whistles of the more commonly-used
Synopsis:
@example
-@@ -10355,7 +10337,7 @@
+@@ -10524,7 +10506,7 @@ to specify which behavior is desired.
@exitstatus
@section @command{ln}: Make links between files
@pindex ln
-@@ -10541,7 +10523,7 @@
+@@ -10711,7 +10693,7 @@ ln -srv /a/file /tmp
Relative symbolic links are generated based on their canonicalized
containing directory, and canonicalized targets. I.e., all symbolic
links in these file names will be resolved.
over relative file name generation, as demonstrated in the following example:
@example
-@@ -10618,7 +10600,7 @@
+@@ -10788,7 +10770,7 @@ ln -s ../adir/afile yetanotherfile
@end example
@section @command{mkdir}: Make directories
@pindex mkdir
-@@ -10691,7 +10673,7 @@
+@@ -10866,7 +10848,7 @@ Print a message for each created directo
@exitstatus
@section @command{mkfifo}: Make FIFOs (named pipes)
@pindex mkfifo
-@@ -10732,7 +10714,7 @@
+@@ -10907,7 +10889,7 @@ permission bits. @xref{File permissions
@exitstatus
@section @command{mknod}: Make block or character special files
@pindex mknod
-@@ -10809,7 +10791,7 @@
+@@ -10984,7 +10966,7 @@ Set the mode of created files to @var{mo
@exitstatus
@section @command{readlink}: Print value of a symlink or canonical file name
@pindex readlink
-@@ -10833,7 +10815,7 @@
+@@ -11008,7 +10990,7 @@ of a symbolic link, it produces no outpu
@command{readlink} outputs the absolute name of the given files which contain
no @file{.}, @file{..} components nor any repeated separators
(@file{/}) or symbolic links. Note the @command{realpath} command is the
@end table
-@@ -10908,7 +10890,7 @@
+@@ -11083,7 +11065,7 @@ The @command{realpath} command without o
@exitstatus
@section @command{rmdir}: Remove empty directories
@pindex rmdir
-@@ -10956,12 +10938,12 @@
+@@ -11131,7 +11113,7 @@ Give a diagnostic for each successful re
@end table
--@xref{rm invocation}, for how to remove non-empty directories (recursively).
-+@xref{rm}, for how to remove non-empty directories (recursively).
+-@xref{rm invocation}, for how to remove non-empty directories recursively.
++@xref{rm}, for how to remove non-empty directories recursively.
+ To remove all empty directories under @var{dirname}, including
+ directories that become empty because other directories are removed,
+@@ -11148,7 +11130,7 @@ find @var{dirname} -depth -type d -exec
@exitstatus
@section @command{unlink}: Remove files via the unlink syscall
@pindex unlink
-@@ -10972,7 +10954,7 @@
+@@ -11159,7 +11141,7 @@ It is a minimalist interface to the syst
@code{unlink} function. @xref{Deleting Files, , , libc,
The GNU C Library Reference Manual}. Synopsis:
It avoids the bells and whistles of the more commonly-used
@example
unlink @var{filename}
-@@ -11006,14 +10988,14 @@
+@@ -11193,14 +11175,14 @@ timestamps, and other information. Coll
These commands change file attributes.
@menu
@section @command{chown}: Change file owner and group
@pindex chown
-@@ -11240,7 +11222,7 @@
+@@ -11427,7 +11409,7 @@ chown -hR root /u
@end example
@section @command{chgrp}: Change group ownership
@pindex chgrp
-@@ -11249,7 +11231,7 @@
+@@ -11436,7 +11418,7 @@ chown -hR root /u
@command{chgrp} changes the group ownership of each given @var{file}
to @var{group} (which can be either a group name or a numeric group ID)
Synopsis:
@example
-@@ -11368,7 +11350,7 @@
+@@ -11555,7 +11537,7 @@ chgrp -hR staff /u
@end example
@section @command{chmod}: Change access permissions
@pindex chmod
-@@ -11490,7 +11472,7 @@
+@@ -11677,7 +11659,7 @@ chmod -R a=,+rwX dir
@end smallexample
@section @command{touch}: Change file timestamps
@pindex touch
-@@ -11664,15 +11646,15 @@
- file status information, and write buffers to disk.
+@@ -11852,15 +11834,15 @@ how much storage is in use or available,
+ file status information, and write buffers to file systems.
@menu
--* df invocation:: Report file system disk space usage.
+-* df invocation:: Report file system space usage.
-* du invocation:: Estimate file space usage.
-* stat invocation:: Report file or file system status.
-* sync invocation:: Synchronize cached writes to persistent storage.
-* truncate invocation:: Shrink or extend the size of a file.
-+* df:: Report file system disk space usage.
++* df:: Report file system space usage.
+* du:: Estimate file space usage.
+* stat:: Report file or file system status.
+* sync:: Synchronize cached writes to persistent storage.
-@node df invocation
+@node df
- @section @command{df}: Report file system disk space usage
+ @section @command{df}: Report file system space usage
@pindex df
-@@ -11980,7 +11962,7 @@
+@@ -12168,7 +12150,7 @@ be read and one or more of the options @
or @option{-x} is used together with a file name argument.
@section @command{du}: Estimate file space usage
@pindex du
-@@ -12237,7 +12219,7 @@
+@@ -12426,7 +12408,7 @@ be one of the following:
@item +@var{format}
@vindex LC_TIME
List timestamps using @var{format}, where @var{format} is interpreted
-like the format argument of @command{date} (@pxref{date invocation}).
+like the format argument of @command{date} (@pxref{date}).
For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
- @command{du} to list timestamps like @samp{2002-03-30 23:45:56}. As
+ @command{du} to list timestamps like @samp{2020-07-21 23:45:56}. As
with @command{date}, @var{format}'s interpretation is affected by the
-@@ -12305,7 +12287,7 @@
+@@ -12494,7 +12476,7 @@ in HP-UX; it also affects the HP-UX @com
@exitstatus
@section @command{stat}: Report file or file system status
@pindex stat
-@@ -12518,7 +12500,7 @@
+@@ -12735,7 +12717,7 @@ with @env{TZ}, libc, The GNU C Library R
@exitstatus
@section @command{sync}: Synchronize cached writes to persistent storage
@pindex sync
-@@ -12577,7 +12559,7 @@
+@@ -12795,7 +12777,7 @@ write barriers, than a global sync(2) us
@exitstatus
@section @command{truncate}: Shrink or extend the size of a file
@pindex truncate
-@@ -12654,13 +12636,13 @@
+@@ -12872,13 +12854,13 @@ the size of each @var{file} based on its
This section describes commands that display text strings.
@menu
@section @command{echo}: Print a line of text
@pindex echo
-@@ -12749,12 +12731,12 @@
+@@ -12967,12 +12949,12 @@ that the behavior of @command{echo} is i
@var{string} contains a backslash or if the first argument is
@option{-n}. Portable programs can use the @command{printf} command
if they need to omit trailing newlines or output control characters or
@section @command{printf}: Format and print data
@pindex printf
-@@ -12916,7 +12898,7 @@
+@@ -13134,7 +13116,7 @@ $ recode BIG5..JAVA < sample.txt \
@exitstatus
@section @command{yes}: Print a string until interrupted
@pindex yes
-@@ -12947,14 +12929,14 @@
+@@ -13165,14 +13147,14 @@ condition of shell @code{if} statements,
pipeline.
@menu
@section @command{false}: Do nothing, unsuccessfully
@pindex false
-@@ -12984,7 +12966,7 @@
+@@ -13202,7 +13184,7 @@ Portable programs should not assume that
non-GNU hosts.
@section @command{true}: Do nothing, successfully
@pindex true
-@@ -13020,7 +13002,7 @@
+@@ -13238,7 +13220,7 @@ This version of @command{true} is implem
more secure and faster than a shell script implementation, and may safely
be used as a dummy shell for the purpose of disabling accounts.
@section @command{test}: Check file types and compare values
@pindex test
-@@ -13389,7 +13371,7 @@
+@@ -13609,7 +13591,7 @@ True if either @var{expr1} or @var{expr2
@end table
@section @command{expr}: Evaluate expressions
@pindex expr
-@@ -13666,11 +13648,11 @@
+@@ -13886,11 +13868,11 @@ useful redirection is performed by a sep
it's described here.
@menu
@section @command{tee}: Redirect output to multiple files or processes
@pindex tee
-@@ -13877,15 +13859,15 @@
+@@ -14098,15 +14080,15 @@ tar chof - "$tardir" \
This section describes commands that manipulate file names.
@menu
@section @command{basename}: Strip directory and suffix from a file name
@pindex basename
-@@ -13967,7 +13949,7 @@
+@@ -14188,7 +14170,7 @@ basename -a -s .h include/stdio.h includ
@end example
@section @command{dirname}: Strip last file name component
@pindex dirname
-@@ -14020,7 +14002,7 @@
+@@ -14241,7 +14223,7 @@ dirname stdio.h
@end example
@section @command{pathchk}: Check file name validity and portability
@pindex pathchk
-@@ -14096,7 +14078,7 @@
+@@ -14317,7 +14299,7 @@ Exit status:
1 otherwise.
@end display
@section @command{mktemp}: Create temporary file or directory
@pindex mktemp
-@@ -14271,7 +14253,7 @@
+@@ -14492,7 +14474,7 @@ Exit status:
@end display
@section @command{realpath}: Print the resolved file name.
@pindex realpath
-@@ -14463,14 +14445,14 @@
+@@ -14684,14 +14666,14 @@ which you are working: the current direc
so forth. See also the user-related commands in the next section.
@menu
@section @command{pwd}: Print working directory
@pindex pwd
-@@ -14517,7 +14499,7 @@
+@@ -14738,7 +14720,7 @@ environment variable is set.
@exitstatus
@section @command{stty}: Print or change terminal characteristics
@pindex stty
-@@ -15259,7 +15241,7 @@
+@@ -15480,7 +15462,7 @@ or
@end table
@section @command{printenv}: Print all or some environment variables
@pindex printenv
-@@ -15294,7 +15276,7 @@
+@@ -15515,7 +15497,7 @@ Exit status:
@end display
@section @command{tty}: Print file name of terminal on standard input
@pindex tty
-@@ -15344,16 +15326,16 @@
+@@ -15565,16 +15547,16 @@ This section describes commands that pri
logins, groups, and so forth.
@menu
@section @command{id}: Print user identity
@pindex id
-@@ -15460,7 +15442,7 @@
+@@ -15681,7 +15663,7 @@ database to be consulted afresh, and so
@exitstatus
@section @command{logname}: Print current login name
@pindex logname
-@@ -15481,7 +15463,7 @@
+@@ -15702,7 +15684,7 @@ options}.
@exitstatus
-@node whoami invocation
+@node whoami
- @section @command{whoami}: Print effective user ID
+ @section @command{whoami}: Print effective user name
@pindex whoami
-@@ -15497,7 +15479,7 @@
+@@ -15718,7 +15700,7 @@ options}.
@exitstatus
@section @command{groups}: Print group names a user is in
@pindex groups
-@@ -15524,7 +15506,7 @@
+@@ -15745,7 +15727,7 @@ options}.
@exitstatus
@section @command{users}: Print login names of users currently logged in
@pindex users
-@@ -15559,7 +15541,7 @@
+@@ -15780,7 +15762,7 @@ should not rely on its existence on non-
@exitstatus
@section @command{who}: Print who is currently logged in
@pindex who
-@@ -15722,16 +15704,14 @@
+@@ -15943,16 +15925,14 @@ This section describes commands that pri
information.
@menu
@section @command{date}: Print or set system date and time
@pindex date
-@@ -16459,7 +16439,7 @@
+@@ -16675,7 +16655,7 @@ date --date='2017-01-01 00:00:00 +0000'
@end itemize
@section @command{arch}: Print machine hardware name
@pindex arch
-@@ -16482,7 +16462,7 @@
+@@ -16698,7 +16678,7 @@ not rely on its existence.
@exitstatus
@section @command{nproc}: Print the number of available processors
@pindex nproc
-@@ -16521,7 +16501,7 @@
+@@ -16737,7 +16717,7 @@ If possible, exclude this @var{number} o
@exitstatus
@section @command{uname}: Print system information
@pindex uname
-@@ -16651,35 +16631,7 @@
+@@ -16867,35 +16847,7 @@ Print the kernel version.
@exitstatus
@section @command{hostid}: Print numeric host identifier
@pindex hostid
-@@ -16707,44 +16659,6 @@
+@@ -16923,44 +16875,6 @@ existence.
@exitstatus
-between systems. Some systems calculate it as the average number of
-runnable processes over the last 1, 5 and 15 minutes, but some systems
-also include processes in the uninterruptible sleep state (that is,
--those processes which are waiting for disk I/O). The Linux kernel
+-those processes which are waiting for device I/O). The Linux kernel
-includes uninterruptible processes.
-
-@command{uptime} is installed only on platforms with infrastructure
@node SELinux context
@chapter SELinux context
-@@ -16756,11 +16670,11 @@
+@@ -16972,11 +16886,11 @@ This section describes commands for oper
contexts.
@menu
@section @command{chcon}: Change SELinux context of file
@pindex chcon
-@@ -16863,7 +16777,7 @@
+@@ -17079,7 +16993,7 @@ Set range @var{range} in the target secu
@exitstatus
@section @command{runcon}: Run a command in specified SELinux context
@pindex runcon
-@@ -16955,16 +16869,16 @@
+@@ -17171,16 +17085,16 @@ different than the current one: a modifi
user, etc.
@menu
@section @command{chroot}: Run a command with a different root directory
@pindex chroot
-@@ -17080,7 +16994,7 @@
+@@ -17296,7 +17210,7 @@ the exit status of @var{command} otherwi
@end display
@section @command{env}: Run a command in a modified environment
@pindex env
-@@ -17698,7 +17612,7 @@
+@@ -17916,7 +17830,7 @@ OLDUSER=gordon
@section @command{nice}: Run a command with modified niceness
@pindex nice
-@@ -17829,7 +17743,7 @@
+@@ -18047,7 +17961,7 @@ $ sudo nice -n -1 nice
@end example
@section @command{nohup}: Run a command immune to hangups
@pindex nohup
-@@ -17903,7 +17817,7 @@
+@@ -18121,7 +18035,7 @@ If @env{POSIXLY_CORRECT} is set, interna
instead of 125.
@section @command{stdbuf}: Run a command with modified I/O stream buffering
@pindex stdbuf
-@@ -17997,7 +17911,7 @@
+@@ -18215,7 +18129,7 @@ the exit status of @var{command} otherwi
@end display
@section @command{timeout}: Run a command with a time limit
@pindex timeout
-@@ -18094,90 +18008,6 @@
- @end display
-
+@@ -18350,90 +18264,6 @@ timeout -s INT 5s env --ignore-signal=IN
+ timeout -s INT -k 3s 5s env --ignore-signal=INT sleep 20
+ @end example
-@node Process control
-@chapter Process control
@node Delaying
@chapter Delaying
-@@ -18187,11 +18017,11 @@
+@@ -18443,11 +18273,11 @@ signal names and numbers.
@c Perhaps @command{wait} or other commands should be described here also?
@menu
@section @command{sleep}: Delay for a specified time
@pindex sleep
-@@ -18241,13 +18071,13 @@
+@@ -18510,13 +18340,13 @@ options}.
These programs do numerically-related operations.
@menu
@section @command{factor}: Print prime factors
@pindex factor
-@@ -18305,7 +18135,7 @@
+@@ -18577,7 +18407,7 @@ are the product of two large primes), ot
@exitstatus
@section @command{numfmt}: Reformat numbers
@pindex numfmt
-@@ -18645,7 +18475,7 @@
+@@ -18917,7 +18747,7 @@ $ LC_ALL=ta_IN numfmt --from=iec --forma
@end example
@section @command{seq}: Print numeric sequences
@pindex seq
-@@ -18817,7 +18647,7 @@
+@@ -19092,7 +18922,7 @@ Naively, a file's atime, mtime, and ctim
whenever you read, write, or change the attributes of the file
respectively, and searching a directory counts as reading it. A
file's atime and mtime can also be set directly, via the
%bcond_with advcopy # progress bar in cp (orphaned patch)
%bcond_with multicall # Compile all the tools in a single binary
%bcond_with tests # unit tests running
+%bcond_without y2038 # Y2038 support for 32-bit archs
Summary: GNU Core-utils - basic command line utilities
Summary(pl.UTF-8): GNU Core-utils - podstawowe narzędzia działające z linii poleceń
Name: coreutils
-Version: 8.32
-Release: 2
+Version: 9.0
+Release: 3
License: GPL v3+
Group: Applications/System
Source0: http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: 022042695b7d5bcf1a93559a9735e668
+# Source0-md5: 0d79ae8a6124546e3b94171375e5e5d0
Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
Source2: DIR_COLORS
Patch1: %{name}-getgid.patch
Patch2: %{name}-uname-cpuinfo.patch
Patch3: %{name}-date-man.patch
-Patch4: %{name}-8.32-ls-removed-dir.patch
Patch6: %{name}-fmt-wchars.patch
Patch7: %{name}-sparc64.patch
# http://translationproject.org/latest/coreutils/pl.po (pass through msgcat to generate shorter diff)
Patch8: %{name}-pl.po-update.patch
-# from http://www.beatex.org/web/advancedcopy.html, edited by shadzik
+# https://github.com/jarun/advcpmv
Patch9: %{name}-advcopy.patch
Patch10: tests.patch
+Patch11: ignore-symlinks.patch
URL: http://www.gnu.org/software/coreutils/
BuildRequires: acl-devel
BuildRequires: attr-devel
BuildRequires: libcap-devel
BuildRequires: libselinux-devel
BuildRequires: rpmbuild(find_lang) >= 1.24
-#BuildRequires: smack-devel
+BuildRequires: smack-devel
BuildRequires: tar >= 1:1.22
BuildRequires: texinfo >= 4.2
BuildRequires: xz
%prep
%setup -q -a1
-%patch8 -p1
+# translationproject seems to be older than in 9.0
+#%patch8 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch6 -p1
%ifarch sparc64
%patch9 -p1
%endif
%patch10 -p1
+%patch11 -p1
%{__mv} man/pt_BR man/pt
%{?with_multicall:--enable-single-binary=symlinks} \
--disable-silent-rules \
--enable-install-program=arch \
- --enable-no-install-program=hostname,kill,uptime
+ --enable-no-install-program=hostname,kill,uptime \
+ %{!?with_y2038:--disable-year2038}
%{__make} -j1
--- /dev/null
+From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 24 Sep 2021 20:57:41 +0100
+Subject: [PATCH] chmod: fix exit status when ignoring symlinks
+
+* src/chmod.c: Reorder enum so CH_NOT_APPLIED
+can be treated as a non error.
+* tests/chmod/ignore-symlink.sh: A new test.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/50784
+---
+ src/chmod.c | 4 ++--
+ tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
+ tests/local.mk | 1 +
+ 4 files changed, 40 insertions(+), 2 deletions(-)
+ create mode 100755 tests/chmod/ignore-symlink.sh
+
+diff --git a/src/chmod.c b/src/chmod.c
+index 37b04f500..57ac47f33 100644
+--- a/src/chmod.c
++++ b/src/chmod.c
+@@ -44,8 +44,8 @@ struct change_status
+ enum
+ {
+ CH_NO_STAT,
+- CH_NOT_APPLIED,
+ CH_FAILED,
++ CH_NOT_APPLIED,
+ CH_NO_CHANGE_REQUESTED,
+ CH_SUCCEEDED
+ }
+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
+ if ( ! recurse)
+ fts_set (fts, ent, FTS_SKIP);
+
+- return CH_NO_CHANGE_REQUESTED <= ch.status;
++ return CH_NOT_APPLIED <= ch.status;
+ }
+
+ /* Recursively change the modes of the specified FILES (the last entry
+diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
+new file mode 100755
+index 000000000..5ce3de816
+--- /dev/null
++++ b/tests/chmod/ignore-symlink.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++# Test for proper exit code of chmod on a processed symlink.
++
++# Copyright (C) 2021 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
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program 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.
++
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <https://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ chmod
++
++mkdir dir || framework_failure_
++touch dir/f || framework_failure_
++ln -s f dir/l || framework_failure_
++
++# This operation ignores symlinks but should succeed.
++chmod u+w -R dir 2> out || fail=1
++
++compare /dev/null out || fail=1
++
++Exit $fail
+diff --git a/tests/local.mk b/tests/local.mk
+index 228d0e368..b5b893fb7 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -456,6 +456,7 @@ all_tests = \
+ tests/chmod/c-option.sh \
+ tests/chmod/equal-x.sh \
+ tests/chmod/equals.sh \
++ tests/chmod/ignore-symlink.sh \
+ tests/chmod/inaccessible.sh \
+ tests/chmod/octal.sh \
+ tests/chmod/setgid.sh \
TLD / packages / coreutils.git / commitdiff