Changeset 548 for abuse/trunkTweet

Timestamp:

Apr 29, 2011, 12:24:38 AM (12 years ago)

Author:

Sam Hocevar

Message:

tool: implement the rename' and del' commands.

Location:

abuse/trunk/src

Files:

• imlib/specs.cpp (modified) (2 diffs)
• tool/abuse-tool.cpp (modified) (5 diffs)

abuse/trunk/src/imlib/specs.cpp

@@ -568 +568 @@
     {
         spec_entry *se = entries[i];
-        if (se->data)
-            free(data);
-
+        free(se->data);
         se->data = malloc(se->size);
         fp->seek(se->offset, SEEK_SET);
@@ -720 +718 @@
       fp->read(&len,1);
       se->type=type;
+      se->data = NULL;
       se->name=dp+sizeof(spec_entry);
       fp->read(se->name,len);

abuse/trunk/src/tool/abuse-tool.cpp

@@ -156 +156 @@
         return EXIT_SUCCESS;
     }
-
-    if (cmd == CMD_GET)
+    else if (cmd == CMD_GET)
     {
         int id = atoi(argv[3]);
@@ -180 +179 @@
         return EXIT_SUCCESS;
     }
-
-    if (cmd == CMD_GETPCX)
+    else if (cmd == CMD_GETPCX)
     {
         palette *pal;
@@ -202 +200 @@
         return EXIT_SUCCESS;
     }
-
-    if (cmd == CMD_MOVE)
+    else if (cmd == CMD_MOVE)
     {
         int src = atoi(argv[3]);
@@ -220 +217 @@
             dir.entries[src] = dir.entries[src + d];
         dir.entries[dst] = tmp;
-
-        dir.calc_offsets();
-        fp.seek(0, SEEK_SET); // FIXME: create a new file
-        dir.write(&fp);
-        for (int i = 0; i < dir.total; i++)
-            fp.write(dir.entries[i]->data, dir.entries[i]->size);
-    }
+    }
+    else if (cmd == CMD_RENAME)
+    {
+        int id = atoi(argv[3]);
+
+        if (id < 0 || id >= dir.total)
+        {
+            fprintf(stderr, "abuse-tool: id %i out of range\n", id);
+            return EXIT_FAILURE;
+        }
+
+        dir.FullyLoad(&fp);
+        dir.entries[id]->name = argv[4];
+    }
+    else if (cmd == CMD_DEL)
+    {
+        int id = atoi(argv[3]);
+
+        if (id < 0 || id >= dir.total)
+        {
+            fprintf(stderr, "abuse-tool: id %i out of range\n", id);
+            return EXIT_FAILURE;
+        }
+
+        dir.total--;
+        for (int i = id; i < dir.total; i++)
+            dir.entries[i] = dir.entries[i + 1];
+
+        dir.FullyLoad(&fp);
+    }
+    else
+    {
+        /* Not implemented yet */
+        return EXIT_FAILURE;
+    }
+
+    /* If we get here, we need to write the directory back */
+    dir.calc_offsets();
+    fp.seek(0, SEEK_SET); // FIXME: create a new file
+    dir.write(&fp);
+    for (int i = 0; i < dir.total; i++)
+        fp.write(dir.entries[i]->data, dir.entries[i]->size);
 
     return EXIT_SUCCESS;
@@ -239 +271 @@
             "  get <id>              dump entry <id> to stdout\n"
             "  getpcx <id>           dump PCX image <id> to stdout\n"
-            "  move <i1> <i2>        move entry <i1> to <i2>\n");
+            "  del <id>              delete entry <id>\n"
+            "  rename <id> <name>    rename entry <id> to <name>\n"
+            "  move <id1> <id2>      move entry <id1> to <id2>\n");
 }