X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=installer%2Finstaller.c;h=439fc2f8c3b000bf1c9c1662a33cd521abc088ab;hb=d0de0a246df2608d786e17b4b3438ecbfb5fcbf0;hp=f0f7b255c7390018ddb0ec414b53f33156390ced;hpb=b573148ab773760a3a78d526d1e020971bb0faca;p=swftools.git

diff --git a/installer/installer.c b/installer/installer.c
index f0f7b25..439fc2f 100644
--- 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);
@@ -809,6 +807,7 @@ static void remove_self()
     fprintf(fp, "del \"%s\"\n", exename);
     fprintf(fp, "if exist \"%s\" goto Repeat\n", exename);
     fprintf(fp, "del \"%s\"\n", batname);
+    fprintf(fp, "rmdir \"%s\"\n", install_path);
     fclose(fp);
 
     STARTUPINFO si;