kes When applying a storage override, release all previous storage

[bacula/bacula] / bacula / src / findlib / save-cwd.c

diff --git a/bacula/src/findlib/save-cwd.c b/bacula/src/findlib/save-cwd.c
index 8d6d75080a5844da55b33440ef65157a534ff0e6..248f0ffccb5b66db6e79872958a9fd152de8fc0f 100644 (file)
--- a/bacula/src/findlib/save-cwd.c
+++ b/bacula/src/findlib/save-cwd.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
+/* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
 
 #include "bacula.h"
 #include "save-cwd.h"
@@ -25,12 +25,12 @@
 
 /* Record the location of the current working directory in CWD so that
    the program may change to other directories and later use restore_cwd
-   to return to the recorded location. This function may allocate
+   to return to the recorded location.  This function may allocate
    space using malloc (via xgetcwd) or leave a file descriptor open;
    use free_cwd to perform the necessary free or close.  Upon failure,
    no memory is allocated, any locally opened file descriptors are
    closed;  return non-zero -- in that case, free_cwd need not be
-   called, but doing so is ok. Otherwise, return zero.  */
+   called, but doing so is ok.  Otherwise, return zero.  */
 
 int
 save_cwd(struct saved_cwd *cwd)
@@ -44,26 +44,26 @@ save_cwd(struct saved_cwd *cwd)
 #if HAVE_FCHDIR
       cwd->desc = open(".", O_RDONLY);
       if (cwd->desc < 0) {
-        berrno be;
-         Emsg1(M_ERROR, 0, "Cannot open current directory: %s\n", be.strerror());
-        return 1;
+         berrno be;
+         Emsg1(M_ERROR, 0, _("Cannot open current directory: %s\n"), be.bstrerror());
+         return 1;
       }
 
 # if __sun__ || sun
       /* On SunOS 4, fchdir returns EINVAL if accounting is enabled,
-        so we have to fall back to chdir.  */
+         so we have to fall back to chdir.  */
       if (fchdir(cwd->desc)) {
-         if (errno == EINVAL) {
-             close(cwd->desc);
-             cwd->desc = -1;
-             have_working_fchdir = 0;
-         } else {
-             berrno be;
-              Emsg1(M_ERROR, 0, "Current directory: %s\n", be.strerror());
-             close(cwd->desc);
-             cwd->desc = -1;
-             return 1;
-         }
+          if (errno == EINVAL) {
+              close(cwd->desc);
+              cwd->desc = -1;
+              have_working_fchdir = 0;
+          } else {
+              berrno be;
+              Emsg1(M_ERROR, 0, _("Current directory: %s\n"), be.bstrerror());
+              close(cwd->desc);
+              cwd->desc = -1;
+              return 1;
+          }
       }
 # endif /* __sun__ || sun */
 #else
@@ -80,10 +80,10 @@ save_cwd(struct saved_cwd *cwd)
 #endif
       cwd->name = (POOLMEM *)getcwd(buf, sizeof_pool_memory(buf));
       if (cwd->name == NULL) {
-        berrno be;
-         Emsg1(M_ERROR, 0, "Cannot get current directory: %s\n", be.strerror());
-        free_pool_memory(buf);
-        return 1;
+         berrno be;
+         Emsg1(M_ERROR, 0, _("Cannot get current directory: %s\n"), be.bstrerror());
+         free_pool_memory(buf);
+         return 1;
       }
   }
   return 0;
@@ -99,16 +99,32 @@ restore_cwd(const struct saved_cwd *cwd, const char *dest, const char *from)
   int fail = 0;
   if (cwd->desc >= 0) {
       if (fchdir(cwd->desc)) {
-        berrno be;
-         Emsg4(M_ERROR, 0, "Cannot return to %s%s%s: %s\n", 
-                 (dest ? dest : "saved working directory"),
-                 (from ? " from " : ""),
-                 (from ? from : ""), be.strerror());
-        fail = 1;
+         berrno be;
+         if (from) {
+            if (dest) {
+               Emsg3(M_ERROR, 0, _("Cannot return to %s from %s: %s\n"),
+                  dest, from, be.bstrerror());
+            }
+            else {
+               Emsg2(M_ERROR, 0, _("Cannot return to saved working directory from %s: %s\n"),
+                  from, be.bstrerror());
+            }
+         }
+         else {
+            if (dest) {
+               Emsg2(M_ERROR, 0, _("Cannot return to %s: %s\n"),
+                  dest, be.bstrerror());
+            }
+            else {
+               Emsg1(M_ERROR, 0, _("Cannot return to saved working directory: %s\n"),
+                  be.bstrerror());
+            }
+         }
+         fail = 1;
       }
   } else if (chdir(cwd->name) < 0) {
       berrno be;
-      Emsg2(M_ERROR, 0, "%s: %s\n", cwd->name, be.strerror());
+      Emsg2(M_ERROR, 0, "%s: %s\n", cwd->name, be.bstrerror());
       fail = 1;
   }
   return fail;