crtxcr
/
adhocify
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

get_eventfile_abspath(): minor improvement: get rid of strcpy etc.

This commit is contained in:
Albert S. 2017-07-28 08:55:53 +02:00
parent bd9bcd8752
commit b9a638d43f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
adhocify.c
View File

@ -374,16 +374,20 @@ char *get_eventfile_abspath(struct inotify_event *event)
{ {
return NULL; return NULL;
} }
size_t nameLen = strlen(event->name);
char *abspath = xmalloc((strlen(wdpath) + nameLen + 2) * sizeof(char)); char *result = NULL;
strcpy(abspath, wdpath); if(event->name != NULL && *event->name != 0)
if(nameLen > 0)
{ {
strcat(abspath, "/"); if(asprintf(&result, "%s/%s", wdpath, event->name) == -1)
strcat(abspath, event->name); {
return NULL;
}
} }
else
return abspath; {
result = strdup(wdpath);
}
return result;
} }
@ -484,7 +488,7 @@ void parse_options(int argc, char **argv)
int option; int option;
int option_index; int option_index;
uint32_t optmask = 0; uint32_t optmask = 0;
while((option = getopt_long(argc, argv, "absdo:w:r:m:l:i:e::", long_options, &option_index)) != -1) while((option = getopt_long(argc, argv, "absdo:w:m:l:i:e::", long_options, &option_index)) != -1)
{ {
switch(option) switch(option)
{ {