fixed copyright

diff --git a/installer/archive.c b/installer/archive.c
index c6aaa01..a551759 100644 (file)
--- a/installer/archive.c
+++ b/installer/archive.c
@@ -1,8 +1,8 @@
 /* archive.c
 
-   Part of the swftools installer.
+   Part of the rfx installer.
    
-   Copyright (c) 2004 Matthias Kramm <kramm@quiss.org> 
+   Copyright (c) 2004-2008 Matthias Kramm <kramm@quiss.org> 
  
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/installer/archive.h b/installer/archive.h
index d2af9a2..357f672 100644 (file)
--- a/installer/archive.h
+++ b/installer/archive.h
@@ -1,8 +1,8 @@
 /* archive.h
 
-   Part of the swftools installer.
+   Part of the rfx installer.
    
-   Copyright (c) 2004 Matthias Kramm <kramm@quiss.org> 
+   Copyright (c) 2004-2008 Matthias Kramm <kramm@quiss.org> 
  
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/installer/installer.c b/installer/installer.c
index f0f7b25..3573858 100644 (file)
--- a/installer/installer.c
+++ b/installer/installer.c
@@ -1,8 +1,8 @@
 /* installer.c
 
-   Part of the swftools installer (Main program).
+   Part of the rfx installer (Main program).
    
-   Copyright (c) 2004 Matthias Kramm <kramm@quiss.org> 
+   Copyright (c) 2004-2008 Matthias Kramm <kramm@quiss.org> 
  
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,8 +31,6 @@
 #endif
 #include "utils.h"
 
-#include "../config.h" //for swftools version
-
 static int config_forAllUsers = 0;
 static int config_createLinks = 0;
 static int config_createStartmenu = 1;
@@ -95,7 +93,7 @@ static filelist_t* readFileList(char*filename)
     fseek(fi, 0, SEEK_END);
     int len = ftell(fi);
     fseek(fi, 0, SEEK_SET);
-    char*data = malloc(len);
+    char*data = malloc(len+1);
     fread(data, len, 1, fi);
     fclose(fi);
     int t=0;
@@ -164,7 +162,7 @@ static void handleTemplateFile(const char*filename)
     fseek(fi, 0, SEEK_END);
     int len = ftell(fi);
     fseek(fi, 0, SEEK_SET);
-    char*file = malloc(len);
+    char*file = malloc(len+1);
     fread(file, len, 1, fi);
     fclose(fi);
     int l = strlen(install_path);

diff --git a/installer/mkarchive.c b/installer/mkarchive.c
index 5762143..45b2a3d 100644 (file)
--- a/installer/mkarchive.c
+++ b/installer/mkarchive.c
@@ -1,3 +1,23 @@
+/* mkarchive.c
+
+   Part of the rfx installer (Main program).
+   
+   Copyright (c) 2004-2008 Matthias Kramm <kramm@quiss.org> 
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -321,6 +341,7 @@ int main (int argn, char*argv[])
                            else if(strstr(argv[t],".jpeg")) id="PIC";
                            else if(strstr(argv[t],".jpg")) id="PIC";
                            else if(strstr(argv[t],".tif")) id="PIC";
+                           else if(strstr(argv[t],".ico")) id="PIC";
                            else if(strstr(argv[t],".c")) id="SRC";
                            else if(strstr(argv[t],".cc")) id="SRC";
                            else if(strstr(argv[t],".cpp")) id="SRC";
@@ -334,6 +355,7 @@ int main (int argn, char*argv[])
                            else if(strstr(argv[t],".afm")) id="FON";
                            else if(strstr(argv[t],".1")) id="DOC";
                            else if(strstr(argv[t],".doc")) id="DOC";
+                           else if(strstr(argv[t],".txt")) id="TXT";
                            else if(strstr(argv[t],".hlp")) id="DOC";
                            else if(strstr(argv[t],".dll")) id="DLL";