Changeset 10 for trunk/src/sh_unix.c

Timestamp:

Jan 1, 2006, 11:58:26 PM (19 years ago)

Author:

rainer

Message:

Support *BSD file flags

File:

• trunk/src/sh_unix.c (modified) (12 diffs)

trunk/src/sh_unix.c

@@ -2363 +2363 @@
  **************************************************************/
 
-#if defined(__linux__) 
-
-#if defined(HAVE_LINUX_EXT2_FS_H) || defined(HAVE_EXT2FS_EXT2_FS_H)
+#if (defined(__linux__) && (defined(HAVE_LINUX_EXT2_FS_H) || defined(HAVE_EXT2FS_EXT2_FS_H))) || defined(HAVE_STAT_FLAGS)
+
+#if defined(__linux__)
 
 /* --- Determine ext2fs file attributes. ---
@@ -2376 +2376 @@
 #endif
 
+/* __linux__ includes */
+#endif
+
 static 
 int sh_unix_getinfo_attr (char * name, 
                           unsigned long * flags, 
                           char * c_attr,
-                          int fd)
+                          int fd, struct stat * buf)
 {
 
@@ -2396 +2399 @@
 
 #ifdef HAVE_STAT_FLAGS
-  struct stat buf;
-  int    i;
 
   SL_ENTER(_("sh_unix_getinfo_attr"));
@@ -2403 +2404 @@
   *flags = 0;
 
-  i = retry_stat (FIL__, __LINE__, name, &buf);
-
-  if (i == -1)
-    SL_RETURN(-1, _("sh_unix_getinfo_attr"));
-
+  /* cast to void to avoid compiler warning about unused parameters */
+  (void) fd;
+  (void) name;
+
+#ifdef UF_NODUMP
+  if (buf->st_flags & UF_NODUMP) {
+    *flags |= UF_NODUMP;
+    c_attr[0] = 'd';
+  }
+#endif
 #ifdef UF_IMMUTABLE
-  if (buf.st_flags & UF_IMMUTABLE)
-    *flags |= EXT2_IMMUTABLE_FL;
+  if (buf->st_flags & UF_IMMUTABLE) {
+    *flags |= UF_IMMUTABLE;
+    c_attr[1] = 'i';
+  }
 #endif
 #ifdef UF_APPEND
-  if (buf.st_flags & UF_APPEND)
-    *flags |= EXT2_APPEND_FL;
-#endif
-#ifdef UF_NODUMP
-  if (buf.st_flags & UF_NODUMP)
-    *flags |= EXT2_NODUMP_FL;
-#endif
-
+  if (buf->st_flags & UF_APPEND) {
+    *flags |= UF_APPEND;
+    c_attr[2] = 'a';
+  }
+#endif
+#ifdef UF_NOUNLINK
+  if (buf->st_flags & UF_NOUNLINK) {
+    *flags |= UF_NOUNLINK;
+    c_attr[3] = 'u';
+  }
+#endif
+#ifdef UF_OPAQUE
+  if (buf->st_flags & UF_OPAQUE) {
+    *flags |= UF_OPAQUE;
+    c_attr[4] = 'o';
+  }
+#endif
+#ifdef SF_ARCHIVED
+  if (buf->st_flags & SF_ARCHIVED) {
+    *flags |= SF_ARCHIVED;
+    c_attr[5] = 'R';
+  }
+    
+#endif
+#ifdef SF_IMMUTABLE
+  if (buf->st_flags & SF_IMMUTABLE) {
+    *flags |= SF_IMMUTABLE;
+    c_attr[6] = 'I';
+  }
+#endif
+#ifdef SF_APPEND
+  if (buf->st_flags & SF_APPEND) {
+    *flags |= SF_APPEND;
+    c_attr[7] = 'A';
+  }
+#endif
+#ifdef SF_NOUNLINK
+  if (buf->st_flags & SF_NOUNLINK) {
+    *flags |= SF_NOUNLINK;
+    c_attr[8] = 'U';
+  }
+#endif
+
+  /* ! HAVE_STAT_FLAGS */
 #else
 
@@ -2429 +2473 @@
 
   *flags = 0;
+  (void) buf;
 
   /* open() -> aud_open() R.Wichmann 
@@ -2444 +2489 @@
     SL_RETURN(-1, _("sh_unix_getinfo_attr"));
 
+  if (f == 0)
+    SL_RETURN(0, _("sh_unix_getinfo_attr"));
+
   *flags = f;
 
@@ -2455 +2503 @@
 /* ! HAVE_EXT2_IOCTLS */
 #endif 
-#endif
 /*
  * END
@@ -2462 +2509 @@
  */
 
+  if (*flags == 0)
+    goto theend;
+
 #ifdef EXT2_SECRM_FL
   if ( (*flags & EXT2_SECRM_FL) != 0  )   c_attr[0] = 's';
@@ -2486 +2536 @@
   if ( (*flags & EXT2_COMPR_FL) != 0   )  c_attr[7] = 'c';
 #endif
-#ifdef EXT2_COMPRBLK_FL
-  if ( (*flags & EXT2_COMPRBLK_FL) != 0)  c_attr[8] = 'B';
-#endif
-#ifdef EXT2_DIRTY_FL
-  if ( (*flags & EXT2_DIRTY_FL) != 0   )  c_attr[9] = 'D';
-#endif
-#ifdef EXT2_NOCOMPR_FL
-  if ( (*flags & EXT2_NOCOMPR_FL) != 0 )  c_attr[10] = 'D';
-#endif
-#ifdef EXT2_ECOMPR_FL
-  if ( (*flags & EXT2_ECOMPR_FL) != 0  )  c_attr[11] = 'D';
+
+#ifdef EXT2_TOPDIR_FL
+  if ( (*flags & EXT2_TOPDIR_FL) != 0  )  c_attr[8] = 'T';
+#endif
+#ifdef EXT2_DIRSYNC_FL
+  if ( (*flags & EXT2_DIRSYNC_FL) != 0 )  c_attr[9] = 'D';
+#endif
+#ifdef EXT2_NOTAIL_FL
+  if ( (*flags & EXT2_NOTAIL_FL) != 0  )  c_attr[10] = 't';
+#endif
+#ifdef EXT2_JOURNAL_DATA_FL
+  if ( (*flags & EXT2_JOURNAL_DATA_FL) != 0)  c_attr[11] = 'j';
+#endif
+
+ theend:
+  /* ext2 */
 #endif
 
@@ -2508 +2563 @@
                           unsigned long * flags, 
                           char * c_attr,
-                          int fd)
+                          int fd, struct stat * buf)
 {
   return 0;
 }
-#endif
-
-/* __LINUX__ */
+
+/* defined(__linux__) || defined(HAVE_STAT_FLAGS) */
 #endif
 
@@ -2908 +2962 @@
   theFile->type = type;
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(HAVE_STAT_FLAGS)
 
   /* --- Determine file attributes. ---
@@ -2919 +2973 @@
       theFile->c_mode[0] != 'l' )
     sh_unix_getinfo_attr(theFile->fullpath, 
-                         &theFile->attributes, theFile->c_attributes, fd);
-
+                         &theFile->attributes, theFile->c_attributes, 
+                         fd, &buf);
 #endif