[X2Go-Commits] [nx-libs] 24/108: Use basename() to derive nxagentProgName cleanly.

git-admin at x2go.org git-admin at x2go.org
Fri Nov 9 20:35:36 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 25c7f02523520beb73a34f7345b00277f6f5696b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Apr 14 03:09:33 2018 +0200

    Use basename() to derive nxagentProgName cleanly.
---
 nx-X11/programs/Xserver/hw/nxagent/Args.c | 7 +++++--
 nx-X11/programs/Xserver/hw/nxagent/Init.c | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index cdcde12..949892f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -40,6 +40,7 @@ is" without express or implied warranty.
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <libgen.h>
 
 #ifdef __sun
 #include <strings.h>
@@ -125,7 +126,7 @@ extern int _XGetBitsPerPixel(Display *dpy, int depth);
 
 extern char dispatchExceptionAtReset;
 
-const char *nxagentProgName;
+char *nxagentProgName;
 
 char nxagentDisplayName[NXAGENTDISPLAYNAMELENGTH];
 Bool nxagentSynchronize = False;
@@ -188,7 +189,9 @@ int ddxProcessArgument(int argc, char *argv[], int i)
    * Ensure that the options are set to their defaults.
    */
 
-  nxagentProgName = argv[0];
+  char *basec = strdup(argv[0]);
+  nxagentProgName = strdup(basename(basec));
+  free(basec);
 
   /*
    * Check if we running as X2Go Agent
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 01acbbc..d95c4b7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -194,7 +194,7 @@ int nxagentX2go;
 
 void checkX2goAgent(void)
 {
-  extern const char *nxagentProgName;
+  extern char *nxagentProgName;
   if( strcasecmp(nxagentProgName,"x2goagent") == 0)
   {
     fprintf(stderr, "\nrunning as X2Go Agent\n");

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list