mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
merge with 3.5.5
This commit is contained in:
1 parent
5ca6750d57
commit
d1c5cbfcdd
20 files changed
+130
-41
No files matched your search
+4
-1
@@ -128,7 +128,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
+4
-1
@@ -143,7 +143,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
+4
-1
@@ -140,7 +140,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
@@ -259,7 +259,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage (NULL);
|
||||
|
||||
@@ -341,7 +341,10 @@ main (argc, argv)
|
||||
scanargs (argc, argv);
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
@@ -179,7 +179,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
@@ -259,7 +259,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage (NULL);
|
||||
|
||||
+4
-1
@@ -197,7 +197,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
@@ -38,6 +38,7 @@ enum backup_type get_version ();
|
||||
int isdir ();
|
||||
int yesno ();
|
||||
void error ();
|
||||
void strip_trailing_slashes ();
|
||||
|
||||
static void usage ();
|
||||
static int do_link ();
|
||||
@@ -150,7 +151,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
@@ -212,8 +216,13 @@ do_link (source, dest)
|
||||
/* Target is a directory; build the full filename. */
|
||||
char *new_dest;
|
||||
char *source_base;
|
||||
char *tmp_source;
|
||||
|
||||
source_base = basename (source);
|
||||
tmp_source = (char *) alloca (strlen (source) + 1);
|
||||
strcpy (tmp_source, source);
|
||||
strip_trailing_slashes (tmp_source);
|
||||
|
||||
source_base = basename (tmp_source);
|
||||
new_dest = (char *)
|
||||
alloca (strlen (source_base) + 1 + strlen (dest) + 1);
|
||||
sprintf (new_dest, "%s/%s", dest, source_base);
|
||||
|
||||
@@ -445,7 +445,10 @@ main (argc, argv)
|
||||
i = decode_switches (argc, argv);
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
+4
-1
@@ -92,7 +92,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
+4
-1
@@ -82,7 +82,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
+4
-1
@@ -83,7 +83,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
@@ -162,7 +162,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
@@ -139,7 +139,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
+4
-1
@@ -80,7 +80,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
+4
-1
@@ -194,7 +194,10 @@ main (argc, argv)
|
||||
}
|
||||
|
||||
if (flag_version)
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
{
|
||||
fprintf (stderr, "%s\n", version_string);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
if (flag_help)
|
||||
usage ();
|
||||
|
||||
Reference in new issue
Block a user