picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: truncate newline inside of read_one_line_file() already

Browse source
This commit is contained in:
Lennart Poettering 2011-04-16 01:48:02 +02:00
parent 8480e784f1
commit 6f9a471aa6
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cgroups-agent.c
View file

@ -43,7 +43,6 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
/* We send this event to the private D-Bus socket and then the
* system instance will forward this to the system bus. We do
* this to avoid an activation loop when we start dbus when we
@ -94,7 +93,6 @@ finish:
dbus_connection_unref(bus);
}
if (m)
dbus_message_unref(m);

1
src/getty-generator.c
View file

@ -86,7 +86,6 @@ int main(int argc, char *argv[]) {
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
const char *tty;
truncate_nl(active);
if ((tty = strrchr(active, ' ')))
tty ++;
else

18
src/util.c
View file

@ -550,6 +550,8 @@ int read_one_line_file(const char *fn, char **line) {
goto finish;
}
truncate_nl(c);
*line = c;
r = 0;
@ -797,7 +799,6 @@ int get_process_name(pid_t pid, char **name) {
if (r < 0)
return r;
truncate_nl(*name);
return 0;
}
@ -3199,8 +3200,7 @@ void status_welcome(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/system-release: %s", strerror(-r));
} else
truncate_nl(pretty_name);
}
}
if (!ansi_color && pretty_name) {
@ -3221,8 +3221,7 @@ void status_welcome(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/SuSE-release: %s", strerror(-r));
} else
truncate_nl(pretty_name);
}
}
if (!ansi_color)
@ -3235,8 +3234,7 @@ void status_welcome(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/gentoo-release: %s", strerror(-r));
} else
truncate_nl(pretty_name);
}
}
if (!ansi_color)
@ -3249,8 +3247,7 @@ void status_welcome(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/altlinux-release: %s", strerror(-r));
} else
truncate_nl(pretty_name);
}
}
if (!ansi_color)
@ -3267,7 +3264,6 @@ void status_welcome(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/debian_version: %s", strerror(-r));
} else {
truncate_nl(version);
pretty_name = strappend("Debian ", version);
free(version);
@ -3826,8 +3822,6 @@ const char *default_term_for_tty(const char *tty) {
* TERM */
if (streq(tty, "console"))
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
truncate_nl(active);
/* If multiple log outputs are configured the
* last one is what /dev/console points to */
if ((tty = strrchr(active, ' ')))