From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Fri, 30 Nov 2012 14:26:14 +0000 (+0100)
Subject: Don't try to add a slash to actual filenames, only paths...
X-Git-Tag: 0.1.9~176
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f915c0f2a6a5e77414773c7a8e947f3266c598c;p=xonotic%2Fgmqcc.git

Don't try to add a slash to actual filenames, only paths...
---

diff --git a/ftepp.c b/ftepp.c
index e7be1e4..3700fd3 100644
--- a/ftepp.c
+++ b/ftepp.c
@@ -994,12 +994,6 @@ static char *ftepp_include_find_path(const char *file, const char *pathfile)
         memcpy(vec_add(filename, len), pathfile, len);
         vec_push(filename, '/');
     }
-    else {
-        len = strlen(pathfile);
-        memcpy(vec_add(filename, len), pathfile, len);
-        if (vec_last(filename) != '/')
-            vec_push(filename, '/');
-    }
 
     len = strlen(file);
     memcpy(vec_add(filename, len+1), file, len);
@@ -1062,7 +1056,7 @@ static bool ftepp_include(ftepp_t *ftepp)
     }
     inlex = lex_open(filename);
     if (!inlex) {
-        ftepp_error(ftepp, "failed to open include file `%s`", filename);
+        ftepp_error(ftepp, "open failed on include file `%s`", filename);
         vec_free(filename);
         return false;
     }