From: Christopher S. Hull <csh@raidersolutions.com>
Date: Sun, 22 Feb 2004 21:50:15 +0000 (+0000)
Subject: reorder stream/data_stream tests so set_win32_attributes gets called
X-Git-Tag: Release-7.0.0~9684
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e5b53bce6546b50310ed6e0687dea414a876b1c2;p=bacula%2Fbacula

reorder stream/data_stream tests so set_win32_attributes gets called


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1069 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/findlib/attribs.c b/bacula/src/findlib/attribs.c
index 6cfcaa6404..99237457fb 100755
--- a/bacula/src/findlib/attribs.c
+++ b/bacula/src/findlib/attribs.c
@@ -278,6 +278,14 @@ int set_attributes(JCR *jcr, ATTR *attr, BFILE *ofd)
    int stat = 1;
 
 #if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
+   if (attr->stream == STREAM_UNIX_ATTRIBUTES_EX &&
+       set_win32_attributes(jcr, attr, ofd)) {
+       if (is_bopen(ofd)) {
+	   bclose(ofd); 
+       }
+       pm_strcpy(&attr->ofname, "*none*");
+       return 1;
+   }
    if (attr->data_stream == STREAM_WIN32_DATA ||
        attr->data_stream == STREAM_WIN32_GZIP_DATA) {
       if (is_bopen(ofd)) {
@@ -287,14 +295,7 @@ int set_attributes(JCR *jcr, ATTR *attr, BFILE *ofd)
       return 1;
    }
 
-   if (attr->stream == STREAM_UNIX_ATTRIBUTES_EX &&
-       set_win32_attributes(jcr, attr, ofd)) {
-      if (is_bopen(ofd)) {
-	 bclose(ofd); 
-      }
-      pm_strcpy(&attr->ofname, "*none*");
-      return 1;
-   }
+
    /*
     * If Windows stuff failed, e.g. attempt to restore Unix file
     *  to Windows, simply fall through and we will do it the