lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-12-21 19:10:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 1ea829256e into b81b1c9271

Browse Source
This commit is contained in:
Elio Blanca
2025-01-30 04:52:43 -05:00
committed by GitHub
parent b81b1c9271 1ea829256e
commit 02a90248a9
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mdbfakeglib.h
View File

@@ -103,6 +103,9 @@ typedef struct GOptionEntry {
typedef struct GOptionContext { typedef struct GOptionContext {
const char *desc; const char *desc;
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME)
const char *invocation_name;
#endif
const GOptionEntry *entries; const GOptionEntry *entries;
} GOptionContext; } GOptionContext;

19
src/libmdb/fakeglib.c
View File

@@ -480,7 +480,21 @@ gchar *g_option_context_get_help (GOptionContext *context,
#elif HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME #elif HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
const char * appname = program_invocation_short_name; const char * appname = program_invocation_short_name;
#else #else
const char * appname = "mdb-util"; const char * appname;
if (context->invocation_name != NULL) {
char * tmp = strrchr(context->invocation_name, '\\');
if (tmp != NULL) {
/* bash into mintty use to copy into argv[0] the full path of the executable, so let's clean it up */
appname = tmp + 1;
}
else {
/* OTOH Windows shell copies the name we typed on command prompt */
appname = context->invocation_name;
}
}
else {
appname = "mdb-util";
}
#endif #endif
char *help = malloc(4096); char *help = malloc(4096);
@@ -528,6 +542,9 @@ gboolean g_option_context_parse(GOptionContext *context,
int i; int i;
int count = 0; int count = 0;
int len = 0; int len = 0;
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME)
context->invocation_name = (*argv)[0];
#endif
if (*argc == 2 && if (*argc == 2 &&
(strcmp((*argv)[1], "-h") == 0 || strcmp((*argv)[1], "--help") == 0)) { (strcmp((*argv)[1], "-h") == 0 || strcmp((*argv)[1], "--help") == 0)) {
fprintf(stderr, "%s", g_option_context_get_help(context, TRUE, NULL)); fprintf(stderr, "%s", g_option_context_get_help(context, TRUE, NULL));