… | |
… | |
294 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
294 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
295 | |
295 | |
296 | cmd_argv[i] = NULL; |
296 | cmd_argv[i] = NULL; |
297 | } |
297 | } |
298 | |
298 | |
299 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
299 | rs[Rs_name] = rxvt_basename (argv[0]); |
300 | |
300 | |
301 | /* |
301 | /* |
302 | * Open display, get options/resources and create the window |
302 | * Open display, get options/resources and create the window |
303 | */ |
303 | */ |
304 | |
304 | |
… | |
… | |
347 | * set any defaults not already set |
347 | * set any defaults not already set |
348 | */ |
348 | */ |
349 | if (cmd_argv && cmd_argv[0]) |
349 | if (cmd_argv && cmd_argv[0]) |
350 | { |
350 | { |
351 | if (!rs[Rs_title]) |
351 | if (!rs[Rs_title]) |
352 | rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); |
352 | rs[Rs_title] = rxvt_basename (cmd_argv[0]); |
353 | if (!rs[Rs_iconName]) |
353 | if (!rs[Rs_iconName]) |
354 | rs[Rs_iconName] = rs[Rs_title]; |
354 | rs[Rs_iconName] = rs[Rs_title]; |
355 | } |
355 | } |
356 | else |
356 | else |
357 | { |
357 | { |
… | |
… | |
1386 | const char *argv0, *shell; |
1386 | const char *argv0, *shell; |
1387 | |
1387 | |
1388 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1388 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1389 | shell = "/bin/sh"; |
1389 | shell = "/bin/sh"; |
1390 | |
1390 | |
1391 | argv0 = (const char *)rxvt_r_basename (shell); |
1391 | argv0 = (const char *)rxvt_basename (shell); |
1392 | |
1392 | |
1393 | if (option (Opt_loginShell)) |
1393 | if (option (Opt_loginShell)) |
1394 | { |
1394 | { |
1395 | login = (char *)rxvt_malloc (strlen (argv0) + 2); |
1395 | login = (char *)rxvt_malloc (strlen (argv0) + 2); |
1396 | |
1396 | |