[patch] compile: rm -rf -> ftw()+rmdir()+unlink() [Re: [patch] compile: Fix MinGW build]

[Jan Kratochvil]

On Tue, 16 Dec 2014 10:04:02 +0100, Kai Tietz wrote:
> Why not using here instead an implementation using FTW-API?

Done.


> At least mingw-w64 added this API recently to runtime for gcc's sake, so
> implementation of an 'rm -rf' should be pretty easy.

It has built on Fedora 21 x86_64 mingw64 for both 32-bit and 64-bit targets.
I am not sure about various other Unices but if the patch gets approved...


On Wed, 17 Dec 2014 18:29:51 +0100, Steve Ellcey wrote:
> /scratch/sellcey/repos/nightly2/src/binutils-gdb/gdb/compile/compile.c:175:10: error: ignoring return value of 'system', declared with attribute warn_unused_result [-Werror=unused-result]
> cc1: all warnings being treated as errors
> make[1]: *** [compile.o] Error 1

It should get fixed by this patch.


I have briefly tested (on Linux; on MinGW I have only tested the build) it
really does delete the directory and its files.

OK for check-in?


Thanks,
Jan
-------------- next part --------------
gdb/ChangeLog
2014-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* compile/compile.c: Include ftw.h.
	(do_rmdir_fn): New function.
	(do_rmdir): Call nftw with it.

diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index 414fc35..7dbc819 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -37,6 +37,7 @@
 #include "filestuff.h"
 #include "target.h"
 #include "osabi.h"
+#include <ftw.h>
 
 
 
@@ -162,17 +163,42 @@ compile_code_command (char *arg, int from_tty)
   do_cleanups (cleanup);
 }
 
+/* Helper for do_rmdir.  */
+
+static int
+do_rmdir_fn (const char *fpath, const struct stat *sb, int typeflag,
+	     struct FTW *ftwbuf)
+{
+  switch (typeflag)
+    {
+    case FTW_DP:
+      if (rmdir (fpath) != 0)
+	warning (_("Cannot remove 'compile' command directory \"%s\": %s"),
+		 fpath, safe_strerror (errno));
+      break;
+    case FTW_F:
+      if (unlink (fpath) != 0)
+	warning (_("Cannot remove 'compile' command file \"%s\": %s"),
+		 fpath, safe_strerror (errno));
+      break;
+    default:
+      warning (_("Unknown 'typeflag' %d for 'compile' command file \"%s\"."),
+	       typeflag, fpath);
+    }
+
+  /* Continue the walk.  */
+  return 0;
+}
+
 /* A cleanup function to remove a directory and all its contents.  */
 
 static void
 do_rmdir (void *arg)
 {
   const char *dir = arg;
-  char *zap;
-  
+
   gdb_assert (strncmp (dir, TMP_PREFIX, strlen (TMP_PREFIX)) == 0);
-  zap = concat ("rm -rf ", dir, (char *) NULL);
-  system (zap);
+  nftw (dir, do_rmdir_fn, 10, FTW_DEPTH | FTW_MOUNT | FTW_PHYS);
 }
 
 /* Return the name of the temporary directory to use for .o files, and