diff options
| author | George Lebl <jirka@5z.com> | 2003-05-17 03:48:46 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2003-05-17 03:48:46 +0000 |
| commit | 7c99774217204408b761d2e38fe36507fa509151 (patch) | |
| tree | e286188ff052f33f52103758cd1dae6118252692 /utils | |
| parent | 2cad9ea80609bdce057d4c084742ecd53ab29c0f (diff) | |
| download | gdm-7c99774217204408b761d2e38fe36507fa509151.tar.gz | |
added Malaylam, Marathi and Oriya languages
Fri May 16 20:46:43 2003 George Lebl <jirka@5z.com>
* gui/gdmlanguages.c, config/locale.alias: added Malaylam, Marathi
and Oriya languages
* gui/gdmlogin.c, gui/greeter/greeter_system.c: fix #105923 by
changing the "Configure..." item to "Configure the login
manager..."
* utils/gdmopen.c: fix the -l option to actually work right
* daemon/slave.c: fix Redhat #91031 by prepending the dash
to the command rather then replacing the command with a dash
when running the shell. This was contributed by
mlblandf@sedona.intel.com (Michael Blandford)
* config/gdm.conf.in, daemon/gdm.h: change PingInterval to
PingIntervalSeconds
* daemon/gdm.[ch], daemon/slave.c: update DisallowTCP properly
* daemon/slave.c: set GDMSESSION before running PreSession
* daemon/misc.c: fixed warnings and an uninitialized var use
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/gdmopen.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/utils/gdmopen.c b/utils/gdmopen.c index fdc382d5..43571baa 100644 --- a/utils/gdmopen.c +++ b/utils/gdmopen.c @@ -107,6 +107,7 @@ main (int argc, char *argv[]) command = argv[1]; if (strcmp (argv[1], "-l") == 0) { + char *p; if (argc <= 2) { fprintf (stderr, "gdmopen: must supply a command!\n"); return 66; @@ -114,9 +115,16 @@ main (int argc, char *argv[]) /* prepend '-' and start the command at * argument 2 */ cmd_start = 2; - command = malloc (strlen (argv[2]) + 2); - strcpy (command+1, argv[2]); - command[0] = '-'; + command = argv[2]; + argv[2] = malloc (strlen (command) + 2); + p = strrchr (command, '/'); + if (p != NULL) { + /* make it "-basename" */ + strcpy (argv[2]+1, p+1); + } else { + strcpy (argv[2]+1, command); + } + *(argv[2]) = '-'; } fd = open ("/dev/console", O_WRONLY, 0); @@ -190,7 +198,7 @@ main (int argc, char *argv[]) write (0, "\033(K", 3); #endif /* __linux__ */ - execvp (command, &argv[1]); + execvp (command, &argv[cmd_start]); _exit (66); /* failed */ } |