Version leap to 1.1.4

other than Linux and FreeBSD, even if nothing was to be restored.

ChangeLog

@@ -1,3 +1,8 @@
+libisofs-1.1.2.tar.gz Fri Jul 08 2011
+===============================================================================
+* Bug fix: The function for restoring ACLs and xattr returned error on systems
+           other than Linux and FreeBSD, even if nothing was to be restored.
+
 libisofs-1.1.2.tar.gz Fri Jul 08 2011
 ===============================================================================
 * New API call iso_image_get_bootcat()

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libisofs], [1.1.2], [http://libburnia-project.org])
+AC_INIT([libisofs], [1.1.4], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -41,7 +41,7 @@ dnl If LIBISOFS_*_VERSION changes, be sure to change AC_INIT above to match.
 dnl
 LIBISOFS_MAJOR_VERSION=1
 LIBISOFS_MINOR_VERSION=1
-LIBISOFS_MICRO_VERSION=2
+LIBISOFS_MICRO_VERSION=4
 LIBISOFS_VERSION=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION.$LIBISOFS_MICRO_VERSION
 
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
@@ -51,10 +51,10 @@ AC_SUBST(LIBISOFS_VERSION)
 
 dnl Libtool versioning
 LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION
-# 2011.07.08  development jump has not yet happened
-# SONAME = 56 - 50 = 6 . Library name = libisofs.6.50.0
-LT_CURRENT=56
-LT_AGE=50
+# 2011.08.08  development jump has not yet happened
+# SONAME = 58 - 52 = 6 . Library name = libisofs.6.52.0
+LT_CURRENT=58
+LT_AGE=52
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 

libisofs/aaip-os-dummy.c

@@ -89,8 +89,12 @@ int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
  continue;
    }
    /* Extended Attribute */
-   if(!(flag & 4))
-     return(-6);
+   if(flag & 4)
+ continue;
+   if(!(flag & 8))
+     if(strncmp(names[i], "user.", 5))
+ continue;
+   return(-6);
  }
  if(flag & 2)
    return(-6);

libisofs/aaip-os-linux.c

@@ -447,10 +447,26 @@ int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
  continue;
    }
    /* Extended Attribute */
+
+#ifdef Libisofs_aaip_linux_set_attr_list_neW
+/* >>> Enable this after release 1.1.4. */
+
+   if(flag & 4)
+ continue;
+   if(!(flag & 8))
+     if(strncmp(names[i], "user.", 5))
+ continue;
+
+#else /* Libisofs_aaip_linux_set_attr_list_neW */
+/* <<< This worked well, but obviously only because bit0 is always set */
+
    if((flag & 1) && !(flag & 8))
      if(strncmp(names[i], "user.", 5))
  continue;
 
+#endif /* ! Libisofs_aaip_linux_set_attr_list_neW */
+
+
 #ifdef Libisofs_with_aaip_xattR
 
    if(flag & 32)

libisofs/ecma119.c

@@ -363,7 +363,7 @@ void write_one_dir_record(Ecma119Image *t, Ecma119Node *node, int file_id,
     struct ecma119_dir_record *rec = (struct ecma119_dir_record*)buf;
     IsoNode *iso;
 
-    len_dr = 33 + len_fi + (len_fi % 2 ? 0 : 1);
+    len_dr = 33 + len_fi + ((len_fi % 2) ? 0 : 1);
 
     memcpy(rec->file_id, name, len_fi);
 
@@ -629,7 +629,7 @@ int write_one_dir(Ecma119Image *t, Ecma119Node *dir, Ecma119Node *parent)
         for (section = 0; section < nsections; ++section) {
 
             /* compute len of directory entry */
-            len = fi_len + 33 + (fi_len % 2 ? 0 : 1);
+            len = fi_len + 33 + ((fi_len % 2) ? 0 : 1);
             if (need_version_number(t, child)) {
                 len += 2;
             }

libisofs/fs_local.c

@@ -862,6 +862,8 @@ int iso_local_set_attrs(char *disk_path, size_t num_attrs, char **names,
             return ISO_OUT_OF_MEM;
         if (ret == -2)
             return ISO_AAIP_BAD_AASTRING;
+        if (ret == -6 || ret == -7)
+            return ISO_AAIP_NOT_ENABLED;
         return ISO_AAIP_NO_SET_LOCAL;
     }
     return 1;

libisofs/iso1999.c

@@ -689,7 +689,7 @@ void write_one_dir_record(Ecma119Image *t, Iso1999Node *node, int file_id,
 
     struct ecma119_dir_record *rec = (struct ecma119_dir_record*)buf;
 
-    len_dr = 33 + len_fi + (len_fi % 2 ? 0 : 1);
+    len_dr = 33 + len_fi + ((len_fi % 2) ? 0 : 1);
 
     memcpy(rec->file_id, name, len_fi);
 
@@ -837,7 +837,7 @@ int write_one_dir(Ecma119Image *t, Iso1999Node *dir)
 
         /* compute len of directory entry */
         fi_len = strlen(child->name);
-        len = fi_len + 33 + (fi_len % 2 ? 0 : 1);
+        len = fi_len + 33 + ((fi_len % 2) ? 0 : 1);
 
         nsections = (child->type == ISO1999_FILE) ? child->info.file->nsections : 1;
         for (section = 0; section < nsections; ++section) {

libisofs/joliet.c

@@ -759,7 +759,7 @@ void write_one_dir_record(Ecma119Image *t, JolietNode *node, int file_id,
 
     struct ecma119_dir_record *rec = (struct ecma119_dir_record*)buf;
 
-    len_dr = 33 + len_fi + (len_fi % 2 ? 0 : 1);
+    len_dr = 33 + len_fi + ((len_fi % 2) ? 0 : 1);
 
     memcpy(rec->file_id, name, len_fi);
 

libisofs/libisofs.h

@@ -1228,7 +1228,7 @@ int iso_lib_is_compatible(int major, int minor, int micro);
  */
 #define iso_lib_header_version_major  1
 #define iso_lib_header_version_minor  1
-#define iso_lib_header_version_micro  2
+#define iso_lib_header_version_micro  4
 
 /**
  * Usage discussion: