chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit-status: Fix "NOTINSSTALLED" typo
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index 54790947ba7d82eb678e73b1d99fd888bbe6094b..58b62fdccfab66cd430c5bb304ef4c7dbd3cc2fd 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
@@
-28,7
+27,9
@@
#include "pager.h"
#include "util.h"
#include "pager.h"
#include "util.h"
+#include "process-util.h"
#include "macro.h"
#include "macro.h"
+#include "terminal-util.h"
static pid_t pager_pid = 0;
static pid_t pager_pid = 0;
@@
-40,7
+41,7
@@
noreturn static void pager_fallback(void) {
} while (n > 0);
if (n < 0) {
} while (n > 0);
if (n < 0) {
- log_error
(
"Internal pager failed: %m");
+ log_error
_errno(errno,
"Internal pager failed: %m");
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
@@
-67,17
+68,15
@@
int pager_open(bool jump_to_end) {
* pager so that we get the value from the actual tty */
columns();
* pager so that we get the value from the actual tty */
columns();
- if (pipe(fd) < 0) {
- log_error("Failed to create pager pipe: %m");
- return -errno;
- }
+ if (pipe(fd) < 0)
+ return log_error_errno(errno, "Failed to create pager pipe: %m");
parent_pid = getpid();
pager_pid = fork();
if (pager_pid < 0) {
r = -errno;
parent_pid = getpid();
pager_pid = fork();
if (pager_pid < 0) {
r = -errno;
- log_error
(
"Failed to fork pager: %m");
+ log_error
_errno(errno,
"Failed to fork pager: %m");
safe_close_pair(fd);
return r;
}
safe_close_pair(fd);
return r;
}
@@
-93,7
+92,7
@@
int pager_open(bool jump_to_end) {
if (!less_opts)
less_opts = "FRSXMK";
if (jump_to_end)
if (!less_opts)
less_opts = "FRSXMK";
if (jump_to_end)
- less_opts = str
append
a(less_opts, " +G");
+ less_opts = str
join
a(less_opts, " +G");
setenv("LESS", less_opts, 1);
/* Make sure the pager goes away when the parent dies */
setenv("LESS", less_opts, 1);
/* Make sure the pager goes away when the parent dies */
@@
-126,10
+125,8
@@
int pager_open(bool jump_to_end) {
}
/* Return in the parent */
}
/* Return in the parent */
- if (dup2(fd[1], STDOUT_FILENO) < 0) {
- log_error("Failed to duplicate pager pipe: %m");
- return -errno;
- }
+ if (dup2(fd[1], STDOUT_FILENO) < 0)
+ return log_error_errno(errno, "Failed to duplicate pager pipe: %m");
safe_close_pair(fd);
return 1;
safe_close_pair(fd);
return 1;
@@
-143,7
+140,7
@@
void pager_close(void) {
/* Inform pager that we are done */
fclose(stdout);
kill(pager_pid, SIGCONT);
/* Inform pager that we are done */
fclose(stdout);
kill(pager_pid, SIGCONT);
- wait_for_terminate(pager_pid, NULL);
+
(void)
wait_for_terminate(pager_pid, NULL);
pager_pid = 0;
}
pager_pid = 0;
}
@@
-176,23
+173,21
@@
int show_man_page(const char *desc, bool null_stdio) {
args[1] = desc;
pid = fork();
args[1] = desc;
pid = fork();
- if (pid < 0) {
- log_error("Failed to fork: %m");
- return -errno;
- }
+ if (pid < 0)
+ return log_error_errno(errno, "Failed to fork: %m");
if (pid == 0) {
/* Child */
if (null_stdio) {
r = make_null_stdio();
if (r < 0) {
if (pid == 0) {
/* Child */
if (null_stdio) {
r = make_null_stdio();
if (r < 0) {
- log_error
("Failed to kill stdio: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to kill stdio: %m"
);
_exit(EXIT_FAILURE);
}
}
execvp(args[0], (char**) args);
_exit(EXIT_FAILURE);
}
}
execvp(args[0], (char**) args);
- log_error
(
"Failed to execute man: %m");
+ log_error
_errno(errno,
"Failed to execute man: %m");
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}