ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hardlink: remove \r from output 

* remove \r from internationalized messages
* remove \r from all output to make it easy to use (see for example
  output file from "hardlink -vv --dry-run . &> log")

* remove unnecessary formatting stuff from output, just keep is simple
  and stupid...

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2019-04-24 18:31:08 +02:00
parent 8a2c8175f2
commit 08a2cf7292
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
misc-utils/hardlink.c
View File

@ -212,7 +212,7 @@ static void process_path(const char *name)
nregfiles++; nregfiles++;
if (verbose > 1) if (verbose > 1)
printf(" %s", name); printf("%s\n", name);
fd = open(name, O_RDONLY); fd = open(name, O_RDONLY);
if (fd < 0) if (fd < 0)
@ -225,8 +225,6 @@ static void process_path(const char *name)
} }
if (read(fd, buf, cksumsize) != cksumsize) { if (read(fd, buf, cksumsize) != cksumsize) {
close(fd); close(fd);
if (verbose > 1 && namelen <= PATH_MAX)
printf("\r%*s\r", (int)(namelen + 2), "");
return; return;
} }
cksumsize = (cksumsize + sizeof(buf[0]) - 1) / sizeof(buf[0]); cksumsize = (cksumsize + sizeof(buf[0]) - 1) / sizeof(buf[0]);
@ -255,8 +253,6 @@ static void process_path(const char *name)
for (fp2 = fp; fp2 && fp2->cksum == cksum; fp2 = fp2->next) { for (fp2 = fp; fp2 && fp2->cksum == cksum; fp2 = fp2->next) {
if (fp2->ino == st.st_ino && fp2->dev == st.st_dev) { if (fp2->ino == st.st_ino && fp2->dev == st.st_dev) {
close(fd); close(fd);
if (verbose > 1 && namelen <= PATH_MAX)
printf("\r%*s\r", (int)(namelen + 2), "");
return; return;
} }
} }
@ -349,17 +345,13 @@ static void process_path(const char *name)
/* We actually did not save anything this time, since the link second argument /* We actually did not save anything this time, since the link second argument
had some other links as well. */ had some other links as well. */
if (verbose > 1) if (verbose > 1)
printf(_("\r%*s\r%s %s to %s\n"), printf(_(" %s %s to %s\n"),
(int)(((namelen > PATH_MAX) ? 0 : namelen) + 2),
"",
(no_link ? _("Would link") : _("Linked")), (no_link ? _("Would link") : _("Linked")),
n1, n2); n1, n2);
} else { } else {
nsaved += ((st.st_size + 4095) / 4096) * 4096; nsaved += ((st.st_size + 4095) / 4096) * 4096;
if (verbose > 1) if (verbose > 1)
printf(_("\r%*s\r%s %s to %s, %s %jd\n"), printf(_(" %s %s to %s, %s %jd\n"),
(int)(((namelen > PATH_MAX) ? 0 : namelen) + 2),
"",
(no_link ? _("Would link") : _("Linked")), (no_link ? _("Would link") : _("Linked")),
n1, n2, n1, n2,
(no_link ? _("would save") : _("saved")), (no_link ? _("would save") : _("saved")),
@ -383,8 +375,6 @@ static void process_path(const char *name)
fp2->next = hp->chain; fp2->next = hp->chain;
hp->chain = fp2; hp->chain = fp2;
} }
if (verbose > 1 && namelen <= PATH_MAX)
printf("\r%*s\r", (int)(namelen + 2), "");
return; return;
} }
} }