external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dtcreate: Replace broken GetBaseName with basename

Browse source 
GetBaseName causes segfaults, because when the pathname
ends in a "/" it returns NULL. This happens when trying
to give a valid filename to dtcreate for an icon.
This commit is contained in:
Frederic Koehler 2012-08-17 00:06:25 -04:00 • committed by Jon Trulson
parent 7d2fee2769
commit f5ac4cf8f9
1 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cde/programs/dtcreate/cmnrtns.c
View file

@ -33,30 +33,13 @@
#include <Dt/Icon.h> #include <Dt/Icon.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include "UxXt.h" #include "UxXt.h"
#include <libgen.h>
#include "dtcreate.h" #include "dtcreate.h"
#include "CreateActionAppShell.h" #include "CreateActionAppShell.h"
#include "fileio.h" #include "fileio.h"
#include "cmnrtns.h" #include "cmnrtns.h"
/*****************************************************************************/
/* */
/* GetBaseName */
/* */
/*****************************************************************************/
char * GetBaseName(char *pszFileName)
{
char *name;
name = strrchr(pszFileName, '/');
if (name) {
name = strtok(name, "/");
return(name);
} else {
return(pszFileName);
}
}
/*****************************************************************************/ /*****************************************************************************/
/* */ /* */
/* ReplaceSpaces */ /* ReplaceSpaces */
@ -273,7 +256,7 @@ void load_icons (Widget wid, XtPointer client_data,
*/ */
{ {
XtVaGetValues(IconSelector, XmNuserData, &iSource, NULL); XtVaGetValues(IconSelector, XmNuserData, &iSource, NULL);
base_name = GetBaseName(path_and_base_name); base_name = basename(path_and_base_name);
ptr = XtMalloc(strlen(base_name) + 1); ptr = XtMalloc(strlen(base_name) + 1);
strcpy(ptr, base_name); strcpy(ptr, base_name);
switch (iSource) { switch (iSource) {