From 7392a5fd4975d1f5aa4048f363394e4ff9f4c313 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 5 Feb 2000 09:53:35 +0000 Subject: . --- doc/Makefile.in | 3 +++ old/fileutils/ChangeLog | 5 +++++ tests/chmod/Makefile.in | 3 +++ tests/cp/Makefile.in | 3 +++ tests/dd/Makefile.in | 3 +++ tests/dircolors/Makefile.in | 3 +++ tests/install/Makefile.in | 3 +++ tests/ln/Makefile.in | 3 +++ tests/ls-2/Makefile.in | 3 +++ tests/ls/Makefile.in | 3 +++ tests/mkdir/Makefile.in | 3 +++ tests/mv/Makefile.in | 13 ++++--------- tests/rm/Makefile.in | 3 +++ tests/rmdir/Makefile.in | 3 +++ tests/shred/Makefile.in | 3 +++ tests/touch/Makefile.in | 5 ++++- 16 files changed, 52 insertions(+), 10 deletions(-) diff --git a/doc/Makefile.in b/doc/Makefile.in index b666d4fd9..263dc36d1 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 e20add7a6..ef6998233 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 f193b0a90..f7a6e9ba3 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 3c7a0b9cc..a09f324a2 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 003b96d44..d0887c3fe 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 2c8d02259..4a4c9333f 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 c7d3a39be..fadd887b6 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 5018af105..cfd04e098 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 c91a46ff0..c87d8f7e0 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 f8d3a8dd2..94a885091 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 c1ccb8a87..133563bdf 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 0e05d8692..1bf4888a4 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 860aa9119..5283201c5 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 998a768dc..66a882293 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 2049ff65e..418b9f85e 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 a2e584358..217201350 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 -- cgit v1.2.3-70-g09d2