    enum RM_status status = remove_entry (AT_FDCWD, ds, filename,
  					DT_UNKNOWN, &st, x);
    if (status == RM_NONEMPTY_DIR)
-@@ -1589,6 +1595,8 @@
+@@ -1589,6 +1594,8 @@
    ds_clear (ds);
    return status;
  }

 
 /* Remove all files and/or directories specified by N_FILES and FILE.
    Apply the options in X.  */
diff -urN --strip-trailing-cr coreutils-6.12/src/rm.c coreutils-6.12-haiku/src/rm.c
--- coreutils-6.12/src/rm.c	2008-05-26 06:40:33.000000000 +0000
+++ coreutils-6.12-haiku/src/rm.c	2008-10-02 14:13:30.000000000 +0000
@@ -357,6 +357,7 @@

   fp->_IO_read_ptr += increment;
 #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
   fp_->_p += increment;
diff -urN coreutils-6.12/lib/fseterr.c coreutils-6.12-haiku/lib/fseterr.c
--- coreutils-6.12/lib/fseterr.c	2008-05-14 12:53:25.000000000 +0000
+++ coreutils-6.12-haiku/lib/fseterr.c	2008-10-02 12:36:27.000000000 +0000
@@ -29,7 +29,7 @@
