1
0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00

A couple of teeny tweaks (#3091)

* Don't get HOMEDRIVE unless needed

* Use put_char instead of put_str
This commit is contained in:
Andy Lester
2024-04-23 02:10:42 -05:00
committed by GitHub
parent 6eff31a204
commit e4d0b12d7d
2 changed files with 4 additions and 4 deletions

View File

@ -206,7 +206,7 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
if (jv_get_kind(msg) == JV_KIND_STRING) {
put_str("<invalid:", F, S, flags & JV_PRINT_ISATTY);
jvp_dump_string(msg, flags | JV_PRINT_ASCII, F, S, flags & JV_PRINT_ISATTY);
put_str(">", F, S, flags & JV_PRINT_ISATTY);
put_char('>', F, S, flags & JV_PRINT_ISATTY);
} else {
put_str("<invalid>", F, S, flags & JV_PRINT_ISATTY);
}
@ -259,7 +259,7 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
put_str("[]", F, S, flags & JV_PRINT_ISATTY);
break;
}
put_str("[", F, S, flags & JV_PRINT_ISATTY);
put_char('[', F, S, flags & JV_PRINT_ISATTY);
jv_array_foreach(x, i, elem) {
if (i!=0) {
if (color) put_str(color, F, S, flags & JV_PRINT_ISATTY);

View File

@ -107,12 +107,12 @@ jv get_home() {
#else
home = getenv("USERPROFILE");
if (!home) {
char *hd = getenv("HOMEDRIVE");
if (!hd) hd = "";
home = getenv("HOMEPATH");
if (!home) {
ret = jv_invalid_with_msg(jv_string("Could not find home directory."));
} else {
const char *hd = getenv("HOMEDRIVE");
if (!hd) hd = "";
ret = jv_string_fmt("%s%s",hd,home);
}
} else {