mraber/xmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improving error messages for icon loading

Browse Source
This commit is contained in:
phillbush 2020-08-12 20:29:33 -03:00
parent 70f5db0f88
commit ed1650a70f
1 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
xmenu.c
View File

@ -574,6 +574,8 @@ parsestdin(void)
file = label + 4; file = label + 4;
label = strtok(NULL, "\t\n"); label = strtok(NULL, "\t\n");
} }
if (file && *file == '\0')
errx(1, "blank icon filename");
/* get the output */ /* get the output */
output = strtok(NULL, "\n"); output = strtok(NULL, "\n");
@ -888,13 +890,51 @@ static Imlib_Image
loadicon(const char *file) loadicon(const char *file)
{ {
Imlib_Image icon; Imlib_Image icon;
Imlib_Load_Error errcode;
const char *errstr;
int width; int width;
int height; int height;
int imgsize; int imgsize;
icon = imlib_load_image(file); icon = imlib_load_image_with_error_return(file, &errcode);
if (icon == NULL) if (icon == NULL) {
errx(1, "could not load icon %s", file); switch (errcode) {
case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
errstr = "file does not exist";
break;
case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
errstr = "file is directory";
break;
case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
errstr = "permission denied";
break;
case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
errstr = "unknown file format";
break;
case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
errstr = "path too long";
break;
case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
errstr = "improper path";
break;
case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
errstr = "too many symbolic links";
break;
case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
errstr = "out of memory";
break;
case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
errstr = "out of file descriptors";
break;
default:
errstr = "unknown error";
break;
}
errx(1, "could not load icon (%s): %s", errstr, file);
}
imlib_context_set_image(icon); imlib_context_set_image(icon);