summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-12-22 18:02:02 +0000
committerEric Andersen2000-12-22 18:02:02 +0000
commit2d5b64273fb10938f963ea845bf558b55c3884fa (patch)
tree7a470ffead9aec7702b319d30fb86dd44c988cd6
parenta9819b290848e0a760f3805d5937fa050235d707 (diff)
downloadbusybox-2d5b64273fb10938f963ea845bf558b55c3884fa.zip
busybox-2d5b64273fb10938f963ea845bf558b55c3884fa.tar.gz
Cleanup from Gennady Feldman <gfeldman@mail.com>
-rw-r--r--lash.c10
-rw-r--r--sh.c10
-rw-r--r--shell/lash.c10
3 files changed, 6 insertions, 24 deletions
diff --git a/lash.c b/lash.c
index a47ff5c..1457116 100644
--- a/lash.c
+++ b/lash.c
@@ -807,14 +807,8 @@ static int get_command(FILE * source, char *command)
signal(SIGWINCH, SIG_DFL);
return 0;
#else
- i=strlen(cwd);
- i--;
- if (i>1){
- while ((i>0) && (*(cwd+i)!='/') ) i--;
- if (*(cwd+i)=='/') i++;
- }
-
- fprintf(stdout, "[%s@%s %s]%s",user, buf, (cwd+i), prompt);
+ fprintf(stdout, "[%s@%s %s]%s",user, buf,
+ get_last_path_component(cwd), prompt);
fflush(stdout);
#endif
}
diff --git a/sh.c b/sh.c
index a47ff5c..1457116 100644
--- a/sh.c
+++ b/sh.c
@@ -807,14 +807,8 @@ static int get_command(FILE * source, char *command)
signal(SIGWINCH, SIG_DFL);
return 0;
#else
- i=strlen(cwd);
- i--;
- if (i>1){
- while ((i>0) && (*(cwd+i)!='/') ) i--;
- if (*(cwd+i)=='/') i++;
- }
-
- fprintf(stdout, "[%s@%s %s]%s",user, buf, (cwd+i), prompt);
+ fprintf(stdout, "[%s@%s %s]%s",user, buf,
+ get_last_path_component(cwd), prompt);
fflush(stdout);
#endif
}
diff --git a/shell/lash.c b/shell/lash.c
index a47ff5c..1457116 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -807,14 +807,8 @@ static int get_command(FILE * source, char *command)
signal(SIGWINCH, SIG_DFL);
return 0;
#else
- i=strlen(cwd);
- i--;
- if (i>1){
- while ((i>0) && (*(cwd+i)!='/') ) i--;
- if (*(cwd+i)=='/') i++;
- }
-
- fprintf(stdout, "[%s@%s %s]%s",user, buf, (cwd+i), prompt);
+ fprintf(stdout, "[%s@%s %s]%s",user, buf,
+ get_last_path_component(cwd), prompt);
fflush(stdout);
#endif
}