Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
25c7f025
Commit
25c7f025
authored
Apr 14, 2018
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use basename() to derive nxagentProgName cleanly.
parent
37383646
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Args.c
nx-X11/programs/Xserver/hw/nxagent/Args.c
+5
-2
Init.c
nx-X11/programs/Xserver/hw/nxagent/Init.c
+1
-1
No files found.
nx-X11/programs/Xserver/hw/nxagent/Args.c
View file @
25c7f025
...
...
@@ -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
;
c
onst
c
har
*
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
...
...
nx-X11/programs/Xserver/hw/nxagent/Init.c
View file @
25c7f025
...
...
@@ -194,7 +194,7 @@ int nxagentX2go;
void
checkX2goAgent
(
void
)
{
extern
c
onst
c
har
*
nxagentProgName
;
extern
char
*
nxagentProgName
;
if
(
strcasecmp
(
nxagentProgName
,
"x2goagent"
)
==
0
)
{
fprintf
(
stderr
,
"
\n
running as X2Go Agent
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment