DeforaOS/libDesktop
DeforaOS/libDesktop
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use getcwd() instead of getwd()

Browse Source 
This avoids warnings in linkers against potential misuse of getwd(),
even though it was apparently safe here.
This commit is contained in:
Pierre Pronchery 2018-01-14 06:48:31 +01:00
parent 86fed7a57a
commit f2e2353888
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mimehandler.c
View File

@ -587,6 +587,8 @@ static int _load_by_name_path(MimeHandler * handler, String const * name,
/* mimehandler_open */ /* mimehandler_open */
static int _open_application(MimeHandler * handler, String const * filename); static int _open_application(MimeHandler * handler, String const * filename);
static int _open_application_getcwd(String const * filename, char * buf,
size_t size);
static int _open_directory(MimeHandler * handler, String const * filename); static int _open_directory(MimeHandler * handler, String const * filename);
static int _open_url(MimeHandler * handler, String const * filename); static int _open_url(MimeHandler * handler, String const * filename);
@ -664,9 +666,14 @@ static int _open_application(MimeHandler * handler, String const * filename)
} }
*p = '\0'; *p = '\0';
q = p; q = p;
if(_open_application_getcwd(filename, buf,
sizeof(buf)) != 0)
{
string_delete(program);
return -1;
}
/* FIXME escape filename */ /* FIXME escape filename */
if((p = string_new_append(program, if((p = string_new_append(program, buf,
(filename[0] != '/') ? getwd(buf) : "",
(filename[0] != '/') ? "/" : "", (filename[0] != '/') ? "/" : "",
filename, &q[2], filename, &q[2],
NULL)) == NULL) NULL)) == NULL)
@ -692,9 +699,14 @@ static int _open_application(MimeHandler * handler, String const * filename)
} }
*p = '\0'; *p = '\0';
q = p; q = p;
if(_open_application_getcwd(filename, buf,
sizeof(buf)) != 0)
{
string_delete(program);
return -1;
}
/* FIXME escape filename */ /* FIXME escape filename */
if((p = string_new_append(program, "file://", if((p = string_new_append(program, "file://", buf,
(filename[0] != '/') ? getwd(buf) : "",
(filename[0] != '/') ? "/" : "", (filename[0] != '/') ? "/" : "",
filename, &q[2], filename, &q[2],
NULL)) == NULL) NULL)) == NULL)
@ -796,6 +808,21 @@ static int _open_application(MimeHandler * handler, String const * filename)
return ret; return ret;
} }
static int _open_application_getcwd(String const * filename, char * buf,
size_t size)
{
if(size == 0)
return -error_set_code(-ENOMEM, "%s", strerror(ENOMEM));
if(filename[0] == '/')
{
buf[0] = '\0';
return 0;
}
if(getcwd(buf, size) == NULL)
return -error_set_code(errno, "%s", strerror(errno));
return 0;
}
static int _open_directory(MimeHandler * handler, String const * filename) static int _open_directory(MimeHandler * handler, String const * filename)
{ {
int ret = 0; int ret = 0;