games-engines/git/files/git-1.2.2-gargoyle.patch

   1 Source: extracted from gargoyle-2008-12-25-sources.zip
   2 Upstream: Gentoo-specific hack
   3 Reason: use Gargoyle extension functions to set a nice window title;
   4         also print error messages in a possibly nicer way
   5
   6 --- git-1.2.2/git_unix.c~       2009-01-21 18:12:38.000000000 +0000
   7 +++ git-1.2.2/git_unix.c        2009-01-24 18:16:14.000000000 +0000
   8 @@ -8,6 +8,8 @@
   9  #include <glk.h>
  10  #include <glkstart.h> // This comes with the Glk library.
  11
  12 +#include <string.h>
  13 +
  14  #ifdef USE_MMAP
  15  #include <fcntl.h>
  16  #include <sys/mman.h>
  17 @@ -25,24 +27,70 @@
  18  #define CACHE_SIZE (256 * 1024L)
  19  #define UNDO_SIZE (512 * 1024L)
  20
  21 +int gHasInited = 0;
  22 +
  23 +#ifdef GARGLK
  24 +
  25 +void fatalError (const char * s)
  26 +{
  27 +       winid_t win;
  28 +       if (!gHasInited)
  29 +       {
  30 +               win = glk_window_open(0, 0, 0, wintype_TextBuffer, 0);
  31 +               glk_set_window(win);
  32 +       }
  33 +       /* pray that this goes somewhere reasonable... */
  34 +       glk_put_string("\n*** fatal error: ");
  35 +       glk_put_string((char*)s);
  36 +       glk_put_string(" ***\n");
  37 +       glk_exit();
  38 +}
  39 +
  40 +#else
  41 +
  42  void fatalError (const char * s)
  43  {
  44      fprintf (stderr, "*** fatal error: %s ***\n", s);
  45      exit (1);
  46  }
  47
  48 +#endif /* GARGLK */
  49 +
  50  #ifdef USE_MMAP
  51  // Fast loader that uses some fancy Unix features.
  52
  53  const char * gFilename = 0;
  54 +char * gStartupError = 0;
  55
  56  int glkunix_startup_code(glkunix_startup_t *data)
  57  {
  58 +#ifdef GARGLK
  59 +       {
  60 +               char buf[32];
  61 +               sprintf(buf, "Git %d.%d.%d", GIT_MAJOR, GIT_MINOR, GIT_PATCH);
  62 +               garglk_set_program_name(buf);
  63 +               sprintf(buf, "Git %d.%d.%d by Iain Merrick\n",
  64 +                               GIT_MAJOR, GIT_MINOR, GIT_PATCH);
  65 +               garglk_set_program_info(buf);
  66 +       }
  67 +#endif /* GARGLK */
  68 +
  69      if (data->argc <= 1)
  70      {
  71 -        printf ("usage: git gamefile.ulx\n");
  72 -        return 0;
  73 +        gStartupError = "No file given";
  74 +        return 1;
  75      }
  76 +
  77 +#ifdef GARGLK
  78 +       {
  79 +               char *s;
  80 +               s = strrchr(data->argv[1], '\\');
  81 +               if (s) garglk_set_story_name(s+1);
  82 +               s = strrchr(data->argv[1], '/');
  83 +               if (s) garglk_set_story_name(s+1);
  84 +       }
  85 +#endif /* GARGLK */
  86 +
  87      gFilename = data->argv[1];
  88      return 1;
  89  }
  90 @@ -53,6 +101,9 @@
  91      struct stat  info;
  92      const char * ptr;
  93
  94 +       if (gStartupError)
  95 +               fatalError(gStartupError);
  96 +
  97      file = open (gFilename, O_RDONLY);
  98      if (file < 0)
  99          goto error;
 100 @@ -61,45 +112,72 @@
 101          goto error;
 102
 103      if (info.st_size < 256)
 104 -    {
 105 -        fprintf (stderr, "This is too small to be a glulx file.\n");
 106 -        exit (1);
 107 -    }
 108 +               fatalError("This is too small to be a glulx file.");
 109
 110      ptr = mmap (NULL, info.st_size, PROT_READ, MAP_PRIVATE, file, 0);
 111      if (ptr == MAP_FAILED)
 112          goto error;
 113
 114 +       gHasInited = 1;
 115 +
 116      git (ptr, info.st_size, CACHE_SIZE, UNDO_SIZE);
 117      munmap ((void*) ptr, info.st_size);
 118      return;
 119
 120  error:
 121 -    perror ("git");
 122 -    exit (errno);
 123 +       sprintf(errmsg, "git: %s", strerror(errno));
 124 +    fatalError(errmsg);
 125  }
 126
 127  #else
 128  // Generic loader that should work anywhere.
 129
 130  strid_t gStream = 0;
 131 +char * gStartupError = 0;
 132
 133  int glkunix_startup_code(glkunix_startup_t *data)
 134  {
 135 +#ifdef GARGLK
 136 +       {
 137 +               char buf[32];
 138 +               sprintf(buf, "Git %d.%d.%d", GIT_MAJOR, GIT_MINOR, GIT_PATCH);
 139 +               garglk_set_program_name(buf);
 140 +               sprintf(buf, "Git %d.%d.%d by Iain Merrick\n",
 141 +                               GIT_MAJOR, GIT_MINOR, GIT_PATCH);
 142 +               garglk_set_program_info(buf);
 143 +       }
 144 +#endif /* GARGLK */
 145 +
 146      if (data->argc <= 1)
 147      {
 148 -        printf ("usage: git gamefile.ulx\n");
 149 -        return 0;
 150 +        gStartupError = "No file given";
 151 +        return 1;
 152 +    }
 153 +
 154 +#ifdef GARGLK
 155 +       {
 156 +               char *s;
 157 +               s = strrchr(data->argv[1], '\\');
 158 +               if (s) garglk_set_story_name(s+1);
 159 +               s = strrchr(data->argv[1], '/');
 160 +               if (s) garglk_set_story_name(s+1);
 161      }
 162 +#endif /* GARGLK */
 163 +
 164      gStream = glkunix_stream_open_pathname ((char*) data->argv[1], 0, 0);
 165      return 1;
 166  }
 167
 168  void glk_main ()
 169  {
 170 +       if (gStartupError)
 171 +               fatalError(gStartupError);
 172 +
 173      if (gStream == NULL)
 174          fatalError ("could not open game file");
 175
 176 +       gHasInited = 1;
 177 +
 178      gitWithStream (gStream, CACHE_SIZE, UNDO_SIZE);
 179  }
 180