archive/bz2: use g_path_get_basename()
Use g_path_get_basename() instead of manually filtering the path name. Big advantage: g_path_get_basename() cannot fail.
This commit is contained in:
parent
b05ba0286e
commit
c3e0fbd9e4
@ -98,7 +98,6 @@ static struct archive_file *
|
|||||||
bz2_open(char *pathname)
|
bz2_open(char *pathname)
|
||||||
{
|
{
|
||||||
bz2_context *context;
|
bz2_context *context;
|
||||||
char *name;
|
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
context = g_malloc(sizeof(*context));
|
context = g_malloc(sizeof(*context));
|
||||||
@ -110,15 +109,7 @@ bz2_open(char *pathname)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
//capture filename
|
context->name = g_path_get_basename(pathname);
|
||||||
name = strrchr(pathname, '/');
|
|
||||||
if (name == NULL) {
|
|
||||||
g_warning("failed to get bzip2 name from %s\n",pathname);
|
|
||||||
g_free(context);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
context->name = g_strdup(name + 1);
|
|
||||||
|
|
||||||
//remove suffix
|
//remove suffix
|
||||||
len = strlen(context->name);
|
len = strlen(context->name);
|
||||||
|
Loading…
Reference in New Issue
Block a user