diff options
author | Catalin Iacob <iacobcatalin@gmail.com> | 2012-03-26 21:44:15 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-04-23 14:16:34 +0200 |
commit | 8eb9c441d4dc7b1a1fc3a1fbf4104b2fda1d071d (patch) | |
tree | 3c45803082bdb27bfdff6ab63dcedfd302d9e0e1 /odk | |
parent | 7de8936d089f88f7976a8cc9aa172c02295e895c (diff) |
WaE: Clang adding 'int' to a string does not append to the string
Diffstat (limited to 'odk')
-rw-r--r-- | odk/source/unoapploader/unx/unoapploader.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index 391667a9c70d..087f086cc6c9 100644 --- a/odk/source/unoapploader/unx/unoapploader.c +++ b/odk/source/unoapploader/unx/unoapploader.c @@ -99,8 +99,10 @@ int main( int argc, char *argv[] ) size_t pathlen = strlen(path); struct stat stat; int ret; + + char unoinfoSuffix[] = "/unoinfo"; char * unoinfo = malloc( - pathlen + RTL_CONSTASCII_LENGTH("/unoinfo") + 1); + pathlen + RTL_CONSTASCII_LENGTH(unoinfoSuffix) + 1); /*TODO: overflow */ if (unoinfo == NULL) { fprintf(stderr, "Error: out of memory!\n"); @@ -109,7 +111,7 @@ int main( int argc, char *argv[] ) strcpy(unoinfo, path); strcpy( unoinfo + pathlen, - "/unoinfo" + (pathlen == 0 || path[pathlen - 1] != '/' ? 0 : 1)); + unoinfoSuffix + (pathlen == 0 || path[pathlen - 1] != '/' ? 0 : 1)); ret = lstat(unoinfo, &stat); free(unoinfo); |