From: Jim Meyering Date: Sat, 5 Feb 2000 09:53:35 +0000 (+0000) Subject: . X-Git-Tag: SH-UTILS-2_0f~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7392a5fd4975d1f5aa4048f363394e4ff9f4c313;p=thirdparty%2Fcoreutils.git . --- diff --git a/doc/Makefile.in b/doc/Makefile.in index b666d4fd9a..263dc36d1d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -98,6 +100,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog index e20add7a69..ef69982332 100644 --- a/old/fileutils/ChangeLog +++ b/old/fileutils/ChangeLog @@ -1,3 +1,8 @@ +2000-02-05 Jim Meyering + + * src/copy.c (copy_internal): Don't allow mv to move a directory onto + a non-directory. Reported by Brian Kimball via Michael Stone. + 2000-02-03 Jim Meyering * tests/mv/Makefile.am (TESTS): Add dir-file. diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in index f193b0a905..f7a6e9ba33 100644 --- a/tests/chmod/Makefile.in +++ b/tests/chmod/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in index 3c7a0b9cc1..a09f324a25 100644 --- a/tests/cp/Makefile.in +++ b/tests/cp/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in index 003b96d441..d0887c3fe7 100644 --- a/tests/dd/Makefile.in +++ b/tests/dd/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in index 2c8d02259d..4a4c9333f2 100644 --- a/tests/dircolors/Makefile.in +++ b/tests/dircolors/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in index c7d3a39be7..fadd887b62 100644 --- a/tests/install/Makefile.in +++ b/tests/install/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in index 5018af1054..cfd04e0988 100644 --- a/tests/ln/Makefile.in +++ b/tests/ln/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in index c91a46ff03..c87d8f7e0d 100644 --- a/tests/ls-2/Makefile.in +++ b/tests/ls-2/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in index f8d3a8dd2e..94a8850910 100644 --- a/tests/ls/Makefile.in +++ b/tests/ls/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in index c1ccb8a87f..133563bdfc 100644 --- a/tests/mkdir/Makefile.in +++ b/tests/mkdir/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in index 0e05d86924..1bf4888a4d 100644 --- a/tests/mv/Makefile.in +++ b/tests/mv/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -111,19 +114,11 @@ l = @l@ AUTOMAKE_OPTIONS = 1.3 gnits TESTS = mv-special-1 into-self into-self-2 into-self-3 backup-is-src \ - i-1 hard-link-1 force partition-perm to-symlink + i-1 hard-link-1 force partition-perm to-symlink dir-file EXTRA_DIST = $(TESTS) setup TESTS_ENVIRONMENT = \ - DF=../../src/df \ - LN=../../src/ln \ - LS=../../src/ls \ - MKDIR=../../src/mkdir \ - MKNOD=../../src/mknod \ - MV=../../src/mv \ - RM=../../src/rm \ - TOUCH=../../src/touch \ PERL="@PERL@" \ PATH=`pwd`/../../src:$$PATH \ PROG=mv diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in index 860aa9119c..5283201c53 100644 --- a/tests/rm/Makefile.in +++ b/tests/rm/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in index 998a768dc9..66a882293c 100644 --- a/tests/rmdir/Makefile.in +++ b/tests/rmdir/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in index 2049ff65e9..418b9f85ea 100644 --- a/tests/shred/Makefile.in +++ b/tests/shred/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in index a2e584358a..217201350f 100644 --- a/tests/touch/Makefile.in +++ b/tests/touch/Makefile.in @@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ +FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -99,6 +101,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -110,7 +113,7 @@ l = @l@ AUTOMAKE_OPTIONS = 1.3 gnits -TESTS = empty-file dir-1 dangling-symlink no-rights +TESTS = dir-1 dangling-symlink empty-file fifo no-rights EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ PATH=`pwd`/../../src:$$PATH