* src/header.c (get_header): use the extend header, user/group name.

(init_header): ditto.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@156 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/header.c b/src/header.c
index c063e4b..21995e0 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -658,7 +658,7 @@ get_header(fp, hdr)
                                for (i = 0; i < header_size - 3; i++)
                                        hdr->name[i] = (char) get_byte();
                                hdr->name[header_size - 3] = '\0';
                                for (i = 0; i < header_size - 3; i++)
                                        hdr->name[i] = (char) get_byte();
                                hdr->name[header_size - 3] = '\0';

-                               name_length = header_size - 3; /* modified by Koji Arai */
+                               name_length = header_size - 3;

                                break;
                        case 2:
                                /*
                                break;
                        case 2:
                                /*


@@ -698,13 +698,17 @@ get_header(fp, hdr)
                                /*
                                 * UNIX group name
                                 */
                                /*
                                 * UNIX group name
                                 */

-                               setup_get(get_ptr + header_size - 3);
+                for (i = 0; i < header_size - 3; i++)
+                    hdr->group[i] = get_byte();
+                hdr->group[i] = '\0';

                                break;
                        case 0x53:
                                /*
                                 * UNIX user name
                                 */
                                break;
                        case 0x53:
                                /*
                                 * UNIX user name
                                 */

-                               setup_get(get_ptr + header_size - 3);
+                for (i = 0; i < header_size - 3; i++)
+                    hdr->user[i] = get_byte();
+                hdr->user[i] = '\0';

                                break;
                        case 0x54:
                                /*
                                break;
                        case 0x54:
                                /*


@@ -847,6 +851,28 @@ init_header(name, v_stat, hdr)
        hdr->unix_uid = v_stat->st_uid;
        hdr->unix_gid = v_stat->st_gid;
 
        hdr->unix_uid = v_stat->st_uid;
        hdr->unix_gid = v_stat->st_gid;
 

+#if HAVE_GETPWUID
+    {
+        struct passwd *ent = getpwuid(hdr->unix_uid);
+
+        if (ent) {
+            strncpy(hdr->user, ent->pw_name, sizeof(hdr->user));
+            if (hdr->user[sizeof(hdr->user)-1])
+                hdr->user[sizeof(hdr->user)-1] = 0;
+        }
+    }
+#endif
+#if HAVE_GETGRGID
+    {
+        struct group *ent = getgrgid(hdr->unix_gid);
+
+        if (ent) {
+            strncpy(hdr->group, ent->gr_name, sizeof(hdr->group));
+            if (hdr->group[sizeof(hdr->group)-1])
+                hdr->group[sizeof(hdr->group)-1] = 0;
+        }
+    }
+#endif

        if (is_directory(v_stat)) {
                bcopy(LZHDIRS_METHOD, hdr->method, METHOD_TYPE_STRAGE);
                hdr->attribute = GENERIC_DIRECTORY_ATTRIBUTE;
        if (is_directory(v_stat)) {
                bcopy(LZHDIRS_METHOD, hdr->method, METHOD_TYPE_STRAGE);
                hdr->attribute = GENERIC_DIRECTORY_ATTRIBUTE;


@@ -986,6 +1012,20 @@ write_header(nafp, hdr)
                        put_word(hdr->unix_gid);
                        put_word(hdr->unix_uid);
 
                        put_word(hdr->unix_gid);
                        put_word(hdr->unix_uid);
 

+            {
+                int i, len = strlen(hdr->group);
+                put_word(len + 3);
+                put_byte(0x52);        /* group name */
+                for (i = 0; i < len; i++)
+                    put_byte(hdr->group[i]);
+
+                len = strlen(hdr->user);
+                put_word(len + 3);
+                put_byte(0x53);        /* user name */
+                for (i = 0; i < len; i++)
+                    put_byte(hdr->user[i]);
+            }
+

                        if (p = (char *) strrchr(hdr->name, DELIM2)) {
                                int             i;
 
                        if (p = (char *) strrchr(hdr->name, DELIM2)) {
                                int             i;