aubinator: only use program_invocation_short_name with glibc/cygwin
authorJonathan Gray <jsg@jsg.id.au>
Thu, 1 Sep 2016 17:12:26 +0000 (03:12 +1000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 8 Sep 2016 17:37:02 +0000 (18:37 +0100)
program_invocation_short_name is a gnu extension.  Limit use of it
to glibc and cygwin and otherwise use getprogname() which is available
on BSD and OS X.

Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/intel/tools/aubinator.c

index df844692b0578750ab79fa11202cc62ad6eef204..fe1f369ec21aa29ece0927c350434dbb1fae3835 100644 (file)
@@ -1014,6 +1014,12 @@ setup_pager(void)
 static void
 print_help(FILE *file)
 {
+   const char *progname;
+#if defined(__GLIBC__) || defined(__CYGWIN__)
+   progname = program_invocation_short_name;
+#else
+   progname = getprogname();
+#endif
    fprintf(file,
            "Usage: %s [OPTION]... FILE\n"
            "Decode aub file contents.\n\n"
@@ -1025,7 +1031,7 @@ print_help(FILE *file)
            "                        if omitted), 'always', or 'never'\n"
            "      --no-pager      don't launch pager\n"
            "      --no-offsets    don't print instruction offsets\n",
-           basename(program_invocation_name));
+           basename(progname));
 }
 
 static bool