merge with 3.9h

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 36094af5edeec6ab976bf8300fac96dc81808299..288803453db1c59353c014b79daa502a7320b451 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -19,14 +19,7 @@
    Some algorithms adapted from GNU Emacs. */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <stdio.h>

diff --git a/lib/dirname.c b/lib/dirname.c
index cb53eb406d1effe71dde7df55a18077d9b3f4a3a..929061480594ee42f85b0dbd1d10ec7961778609 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #ifdef STDC_HEADERS

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index ee82f7596eb332950cb4a39e292fe6542d67ab72..83ac04fd6e1a3da7cbee16f0807d469683fc3044 100644 (file)
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -18,14 +18,7 @@
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
 \f
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #if !defined (HAVE_ST_BLOCKS) && !defined(_POSIX_SOURCE)

diff --git a/lib/filemode.c b/lib/filemode.c
index 838f49af0c6a2a6f2eecca3ec80815be7280a464..e88fc1249e3160cabef2d61b77a1f668521eb68d 100644 (file)
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -16,11 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 \f
 #ifdef HAVE_CONFIG_H
-#if defined (emacs) || defined (CONFIG_BROKETS)
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/fsusage.c b/lib/fsusage.c
index d60a4c6a73f7981ea7b3457fcd24720392e7d397..9bef62aba72966d14b07ca07c5bdec41847cf896 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/ftruncate.c b/lib/ftruncate.c
index 58cd2bba97aac9ff2ea6b2f20073ca0b7346f235..1272ee74f6dd928170e08261c96e17c70cfdc69c 100644 (file)
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -2,14 +2,7 @@
    This file is in the public domain.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/full-write.c b/lib/full-write.c
index 6e2e446830516fdac26b3687f112385b2472da62..339fb1a48382fad4ee0d376980d1bcd78e3b5d42 100644 (file)
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -19,14 +19,7 @@
    */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>
@@ -47,7 +40,7 @@ int
 full_write (desc, ptr, len)
      int desc;
      char *ptr;
-     int len;
+     size_t len;
 {
   int total_written;
 

diff --git a/lib/isdir.c b/lib/isdir.c
index adfd88a83a8b487e08496ac23a8ebdca8fb33709..dbc9bd07df9c9be1e5ce922fd88654e449678051 100644 (file)
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/makepath.c b/lib/makepath.c
index 9725168d2f95a94393d4ca769d4ee6eaf905b2f7..f0303fa8f5de78c900cb6ca6d237205d42de3d87 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -19,14 +19,7 @@
    Jim Meyering <meyering@cs.utexas.edu>.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #ifdef __GNUC__

diff --git a/lib/modechange.c b/lib/modechange.c
index 1c0a59143a69ffa47c79330e8c09c84d82688b3c..8eb8dc55db11c099c4d1f80dd15562bb758c4ab8 100644 (file)
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -25,14 +25,7 @@
    performance gain. */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/rename.c b/lib/rename.c
index b2cf2ceac801f6b27fca982017a28831e9a11f1f..63193973b6f30116c14bffdd1489fe7b0acd616c 100644 (file)
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/safe-read.c b/lib/safe-read.c
index 2e131e1f2c600e49ae52c039916808b982c70320..22e705aedb951396850eb374fd0b158c6b199779 100644 (file)
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -17,14 +17,7 @@
    */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/savedir.c b/lib/savedir.c
index cdf1288a3e6706185f43c1d027e246bd8098efae..32c793b607076130c8fb1fe6a1f2990ef9fde8f5 100644 (file)
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -18,14 +18,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>

diff --git a/lib/userspec.c b/lib/userspec.c
index 75000e8fd354e22ccd5701b86603bd773baa7ee6..67f1583335c513b3043a01a83e5484bdf6644f6c 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -18,14 +18,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 \f
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #ifdef __GNUC__

diff --git a/src/rm.c b/src/rm.c
index 5ff703cba08fd32d07320b1af70c82647c9071fc..cd5dd2050f23c59650d14c5b33b1c9aaea800434 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -1,5 +1,5 @@
 /* `rm' file deletion utility for GNU.
-   Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1990, 1991, 1994 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
@@ -270,7 +270,7 @@ remove_dir (statp)
     }
 
   if (!ignore_missing_files && (interactive || stdin_tty)
-      && eaccess_stat (statp, W_OK))
+      && eaccess_stat (statp, W_OK, pathname))
     {
       fprintf (stderr,
               "%s: descend directory `%s', overriding mode %04o? ",