Changeset 540Tweet

Timestamp:

Apr 24, 2011, 10:33:34 AM (11 years ago)

Author:

Sam Hocevar

Message:

tool: get rid of the specfile additions and implement a general purpose
SPEC file edition tool.

Location:

abuse/trunk

Files:

• .gitignore (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/imlib/specs.cpp (modified) (2 diffs)
• src/imlib/specs.h (modified) (1 diff)
• src/sdlport/setup.cpp (modified) (1 diff)
• src/tool (added)
• src/tool/abuse-tool.cpp (added)

abuse/trunk/.gitignore

@@ -16 +16 @@
 abuse.6
 src/abuse
+src/abuse-tool

abuse/trunk/src/Makefile.am

@@ -3 +3 @@
 SUBDIRS = lisp net imlib sdlport
 
-bin_PROGRAMS = abuse
+bin_PROGRAMS = abuse abuse-tool
 
 abuse_SOURCES = \
@@ -69 +69 @@
 abuse_DEPENDENCIES = $(EXTRALIBS)
 
+abuse_tool_SOURCES = \
+    tool/abuse-tool.cpp
+abuse_tool_LDADD = imlib/libimlib.a
+abuse_tool_DEPENDENCIES = $(abuse_tool_LDADD)
+
 INCLUDES = -I$(srcdir) -I $(srcdir)/lisp -I$(srcdir)/imlib \
            -I$(srcdir)/net $(SDL_CFLAGS)

abuse/trunk/src/imlib/specs.cpp

@@ -25 +25 @@
 #include "image.h"
 #include "palette.h"
-#include "pcxread.h"
 #include "specs.h"
 #include "dprint.h"
@@ -963 +962 @@
 }
 
-void spec_directory::extract(char const *name)
-{
-    jFILE fp(name, "rb");
-    if (fp.open_failure())
-    {
-        fprintf(stderr, "Spec: ERROR - could not open %s\n", name);
-        return;
-    }
-
-    spec_directory dir(&fp);
-    if (dir.total <= 0)
-    {
-        fprintf(stderr, "Spec: ERROR - no signature or no data in %s\n", name);
-        return;
-    }
-
-    char const *out = "SPEC.DIR";
-    mkdir(out, S_IRUSR | S_IWUSR | S_IXUSR);
-    if (chdir(out))
-    {
-        fprintf(stderr, "Spec: ERROR - could not create or cd to %s\n", out);
-        return;
-    }
-
-    palette *pal = NULL;
-
-    for (int i = 0; i < dir.total; i++)
-    {
-        spec_entry *se = dir.entries[i];
-
-        FILE *fp2 = fopen(se->name, "wb");
-        if (!fp2)
-        {
-            fprintf(stderr, "Spec: ERROR - could not write to %s\n", se->name);
-            continue;
-        }
-
-        fp.seek(se->offset, SEEK_SET);
-        uint8_t buf[1024];
-        size_t todo = se->size;
-        while (todo > 0)
-        {
-            fp.read(buf, Min(todo, 1024));
-            fwrite(buf, Min(todo, 1024), 1, fp2);
-            todo -= Min(todo, 1024);
-        }
-        fclose(fp2);
-
-        fprintf(stderr, "Spec: %s (type %i): %i bytes\n",
-                se->name, se->type, (int)se->size);
-
-        /* If it's a palette, keep it */
-        if (!pal && se->type == SPEC_PALETTE)
-            pal = new palette(se, &fp);
-    }
-
-    /* If we have a palette, output all images */
-    for (int i = 0; pal && i < dir.total; i++)
-    {
-        char buf[1024];
-        spec_entry *se = dir.entries[i];
-
-        switch (se->type)
-        {
-        case SPEC_IMAGE:
-        case SPEC_FORETILE:
-        case SPEC_BACKTILE:
-        case SPEC_CHARACTER:
-        case SPEC_CHARACTER2:
-            sprintf(buf, "%s-export.pcx", se->name);
-            image *im = new image(&fp, se);
-            write_PCX(im, pal, buf);
-            delete im;
-            fprintf(stderr, "Spec: %s is an image\n", buf);
-            break;
-        }
-    }
-
-    /* Clean up */
-    delete pal;
-}
-
 void note_open_fd(int fd, char const *str)
 {

abuse/trunk/src/imlib/specs.h

@@ -207 +207 @@
   void delete_entries();   // if the directory was created by hand instead of by file
   ~spec_directory();
-
-  static void extract(char const *name);
 } ;
 

abuse/trunk/src/sdlport/setup.cpp

@@ -336 +336 @@
             }
         }
-        else if (ii + 1 < argc && !strcasecmp(argv[ii], "-export"))
-        {
-            spec_directory::extract(argv[++ii]);
-            exit(0);
-        }
         else if( !strcasecmp( argv[ii], "-h" ) || !strcasecmp( argv[ii], "--help" ) )
         {