mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: Additional GUESTFISH_* environment variables to control the prompt.

Browse Source 
This adds:

 - GUESTFISH_INIT
 - GUESTFISH_OUTPUT
 - GUESTFISH_RESTORE

which along with existing GUESTFISH_PS1 allow you to fine control the
colour of the output.
This commit is contained in:
Richard W.M. Jones
2014-02-03 09:08:12 +01:00
parent bed8a168c0
commit d93e3c50eb
2 changed files with 80 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
fish/fish.c
View File

@@ -634,7 +634,10 @@ shell_script (void)
#define FISH "><fs> "
static char *ps1 = NULL;
static char *ps1 = NULL; /* GUESTFISH_PS1 */
static char *ps_output = NULL; /* GUESTFISH_OUTPUT */
static char *ps_restore = NULL; /* GUESTFISH_RESTORE */
static char *ps_init = NULL; /* GUESTFISH_INIT */
static char *line_read = NULL;
static char *
@@ -652,6 +655,11 @@ rl_gets (int prompt)
p = prompt && ps1 ? decode_ps1 (ps1) : NULL;
line_read = readline (prompt ? (ps1 ? p : FISH) : "");
if (ps_output) { /* GUESTFISH_OUTPUT */
CLEANUP_FREE char *po = decode_ps1 (ps_output);
printf ("%s", po);
}
if (line_read && *line_read)
add_history_line (line_read);
@@ -683,6 +691,11 @@ script (int prompt)
struct parsed_command pcmd;
if (prompt) {
if (ps_init) { /* GUESTFISH_INIT */
CLEANUP_FREE char *pi = decode_ps1 (ps_init);
printf ("%s", pi);
}
printf (_("\n"
"Welcome to guestfish, the guest filesystem shell for\n"
"editing virtual machine filesystems and disk images.\n"
@@ -718,7 +731,14 @@ script (int prompt)
}
}
}
if (prompt) printf ("\n");
if (prompt) {
printf ("\n");
if (ps_restore) { /* GUESTFISH_RESTORE */
CLEANUP_FREE char *pr = decode_ps1 (ps_restore);
printf ("%s", pr);
}
}
}
/* Parse a command string, splitting at whitespace, handling '!', '#' etc.
@@ -1479,6 +1499,26 @@ initialize_readline (void)
exit (EXIT_FAILURE);
}
}
str = getenv ("GUESTFISH_OUTPUT");
if (str) {
free (ps_output);
ps_output = strdup (str);
if (!ps_output) {
perror ("strdup");
exit (EXIT_FAILURE);
}
}
str = getenv ("GUESTFISH_INIT");
if (str) {
free (ps_init);
ps_init = strdup (str);
if (!ps_init) {
perror ("strdup");
exit (EXIT_FAILURE);
}
}
#endif
}