Changeset 9e0b65484828b2b33db73d5324959df28b8d120d

Timestamp:

11/28/10 12:26:36 (2 years ago)

Author:

Nikita Zlobin <cook60020tmp@…>

Children:

a5d878cdc4363738db31c771dace7c14c4c75d3b

Parents:

416c65254bc9ccc5cdc7d6a4b8d0550e4b2d9041

git-author:

Nikita Zlobin <cook60020tmp@mail.ru> / 2010-10-18T16:32:14Z+0600

git-committer:

Nikita Zlobin <cook60020tmp@mail.ru> / 2010-11-28T15:26:36Z+0500

Message:

Make file reading function common

Files:

• common/file.c (added)
• common/file.h (added)
• gui/about.c (modified) (1 diff)
• wscript (modified) (1 diff)

gui/about.c

@@ -35 +35 @@
 #include "version.h"
 
+#include "../common/file.h"
+
 #define ABOUT_DIALOG_LOGO     "ladish-logo-128x128.png"
-
-static char * read_file_contents(const char * filename)
-{
-  int fd;
-  struct stat st;
-  char * buffer;
-
-  if (stat(filename, &st) != 0)
-  {
-    return NULL;
-  }
-
-  fd = open(filename, O_RDONLY);
-  if (fd == -1)
-  {
-    return NULL;
-  }
-
-  buffer = malloc(st.st_size + 1);
-  if (buffer == NULL)
-  {
-    close(fd);
-    return NULL;
-  }
-
-  if (read(fd, buffer, (size_t)st.st_size) != (ssize_t)st.st_size)
-  {
-    free(buffer);
-    buffer = NULL;
-  }
-  else
-  {
-    buffer[st.st_size] = 0;
-  }
-
-  close(fd);
-
-  return buffer;
-}
 
 void show_about(void)

wscript

@@ -541 +541 @@
         for source in [
             'catdup.c',
+            'file.c',
             ]:
             gladish.source.append(os.path.join("common", source))