m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more debug output in Get_config_directory() and Get_program_directory()

Browse Source 
readlink() returns the number of bytes written
This commit is contained in:
Thomas Bernard 2019-05-16 12:29:20 +02:00
parent 0eb715bd17
commit cbc6b96639
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/setup.c
View File

@ -49,6 +49,7 @@
#elif defined(__linux__) #elif defined(__linux__)
#include <limits.h> #include <limits.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#elif defined(__HAIKU__) #elif defined(__HAIKU__)
#include <FindDirectory.h> #include <FindDirectory.h>
#endif #endif
@ -113,14 +114,20 @@ char * Get_program_directory(const char * argv0)
#elif defined(__linux__) #elif defined(__linux__)
if (argv0[0]!='/') if (argv0[0]!='/')
{ {
ssize_t path_len;
char path[PATH_MAX]; char path[PATH_MAX];
if (readlink("/proc/self/exe", path, sizeof(path)) >= 0) path_len = readlink("/proc/self/exe", path, sizeof(path));
if (path_len >= 0)
{ {
path[path_len] = '\0'; // add null terminating char
GFX2_Log(GFX2_DEBUG, "binary path resolved to : %s\n", path);
program_dir = Extract_path(NULL, path); program_dir = Extract_path(NULL, path);
return program_dir;
} }
else
GFX2_Log(GFX2_WARNING, "readlink(%s) failed : %s\n", "/proc/self/exe", strerror(errno));
} }
program_dir = Extract_path(NULL, argv0); else
program_dir = Extract_path(NULL, argv0);
// Others: The part of argv[0] before the executable name. // Others: The part of argv[0] before the executable name.
// Keep the last \ or /. // Keep the last \ or /.
@ -283,9 +290,10 @@ char * Get_config_directory(const char * program_dir)
} }
if (!Directory_exists(config_dir)) if (!Directory_exists(config_dir))
{ {
// Tentative de création // try to create it
if (Create_ConfigDirectory(config_dir) < 0) if (Create_ConfigDirectory(config_dir) < 0)
{ {
GFX2_Log(GFX2_WARNING, "Failed to create directory \"%s\"\n", config_dir);
// Echec: on se rabat sur le repertoire de l'executable. // Echec: on se rabat sur le repertoire de l'executable.
Portable_Installation_Detected = 1; Portable_Installation_Detected = 1;
free(config_dir); free(config_dir);
@ -297,6 +305,7 @@ char * Get_config_directory(const char * program_dir)
config_dir = strdup(program_dir); config_dir = strdup(program_dir);
#endif #endif
} }
GFX2_Log(GFX2_INFO, "\"%s\" directory created.\n", config_dir);
} }
} }
} }