Extract backuped sockets as dummy files.

diff --git a/CHANGES b/CHANGES
index bcbb3b5ca0fb0254cef87a6ff51ae3f900170a88..f2d56fcb1badc48fe5606406eb6eaa6c35b0bcee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.313 2010/06/10 12:17:35 stelian Exp $
+$Id: CHANGES,v 1.314 2010/06/11 09:51:59 stelian Exp $

 
 Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
 ===================================================================
 
 Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
 ===================================================================


@@ -54,6 +54,12 @@ Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
        Kieran Clancy <codebeard@users.sourceforge.net> for reporting the
        bug (Sourceforge bug #2999207).
 
        Kieran Clancy <codebeard@users.sourceforge.net> for reporting the
        bug (Sourceforge bug #2999207).
 

+12.    Extract dumped UNIX sockets as dummy files, instead of not
+       restoring them at all. This will correct some warnings during
+       the restoration of incrementals, if the inodes previously occupied
+       by sockets gets reused by other files. See Sourceforge bug
+       #3007216 for details.
+

 Changes between versions 0.4b41 and 0.4b42 (released June 18, 2009)
 ===================================================================
 
 Changes between versions 0.4b41 and 0.4b42 (released June 18, 2009)
 ===================================================================
 

diff --git a/restore/tape.c b/restore/tape.c
index 3dc8bbaf7feb89560c699b8bb7d95b9f4439fa45..5ee9973f5fdf4bb996652060f28f3dd089af6854 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.96 2010/03/22 15:40:55 stelian Exp $";
+       "$Id: tape.c,v 1.97 2010/06/11 09:51:59 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -843,9 +843,43 @@ extractfile(struct entry *ep, int doremove)
                return (FAIL);
 
        case IFSOCK:
                return (FAIL);
 
        case IFSOCK:

-               Vprintf(stdout, "skipped socket %s\n", name);
+       {
+               uid_t luid = curfile.dip->di_uid;
+               gid_t lgid = curfile.dip->di_gid;
+
+               Vprintf(stdout, "extract socket as dummy file %s\n", name);

                skipfile();
                skipfile();

+               if (Nflag)
+                       return (GOOD);
+               if (! (spcl.c_flags & DR_METAONLY)) {
+                       int fd;
+                       if (uflag)
+                               (void)unlink(name);
+                       if ((fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) {
+                               warn("%s: cannot create dummy file", name);
+                               return (FAIL);
+                       }
+                       close(fd);
+               }
+               (void) chown(name, luid, lgid);
+               (void) chmod(name, mode);
+               extractattr(name);
+               utimes(name, timep);
+               if (flags)
+#ifdef __linux__
+                       (void) lsetflags(name, flags);
+#else
+#ifdef sunos
+                       {
+                       warn("%s: cannot call chflags", name);
+                       /* (void) chflags(name, flags); */
+                       }
+#else
+                       (void) chflags(name, flags);
+#endif
+#endif

                return (GOOD);
                return (GOOD);

+       }

 
        case IFDIR:
        {
 
        case IFDIR:
        {