chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device: allow easy identification of network interfaces without their full sysfs...
[elogind.git]
/
util.c
diff --git
a/util.c
b/util.c
index fd991cf807253b88d4cc90e509dee2725bc7a96c..f5f1b3a45e642655217be276d8c7700c058c88a4 100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-42,6
+42,7
@@
#include <sys/inotify.h>
#include <sys/poll.h>
#include <libgen.h>
#include <sys/inotify.h>
#include <sys/poll.h>
#include <libgen.h>
+#include <ctype.h>
#include "macro.h"
#include "util.h"
#include "macro.h"
#include "util.h"
@@
-141,6
+142,30
@@
bool startswith(const char *s, const char *prefix) {
return memcmp(s, prefix, pl) == 0;
}
return memcmp(s, prefix, pl) == 0;
}
+bool startswith_no_case(const char *s, const char *prefix) {
+ size_t sl, pl;
+ unsigned i;
+
+ assert(s);
+ assert(prefix);
+
+ sl = strlen(s);
+ pl = strlen(prefix);
+
+ if (pl == 0)
+ return true;
+
+ if (sl < pl)
+ return false;
+
+ for(i = 0; i < pl; ++i) {
+ if (tolower(s[i]) != tolower(prefix[i]))
+ return false;
+ }
+
+ return true;
+}
+
bool first_word(const char *s, const char *word) {
size_t sl, wl;
bool first_word(const char *s, const char *word) {
size_t sl, wl;
@@
-1199,6
+1224,7
@@
bool ignore_file(const char *filename) {
return
filename[0] == '.' ||
return
filename[0] == '.' ||
+ streq(filename, "lost+found") ||
endswith(filename, "~") ||
endswith(filename, ".rpmnew") ||
endswith(filename, ".rpmsave") ||
endswith(filename, "~") ||
endswith(filename, ".rpmnew") ||
endswith(filename, ".rpmsave") ||
@@
-1429,10
+1455,14
@@
int ask(char *ret, const char *replies, const char *text, ...) {
int r;
bool need_nl = true;
int r;
bool need_nl = true;
+ fputs("\x1B[1m", stdout);
+
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
va_start(ap, text);
vprintf(text, ap);
va_end(ap);
+ fputs("\x1B[0m", stdout);
+
fflush(stdout);
if ((r = read_one_char(stdin, &c, &need_nl)) < 0) {
fflush(stdout);
if ((r = read_one_char(stdin, &c, &need_nl)) < 0) {
@@
-1567,7
+1597,7
@@
int flush_fd(int fd) {
}
int acquire_terminal(const char *name, bool fail, bool force) {
}
int acquire_terminal(const char *name, bool fail, bool force) {
- int fd = -1, notify = -1, r, wd;
+ int fd = -1, notify = -1, r, wd
= -1
;
assert(name);
assert(name);
@@
-1673,13
+1703,24
@@
fail:
int release_terminal(void) {
int r = 0, fd;
int release_terminal(void) {
int r = 0, fd;
+ struct sigaction sa_old, sa_new;
- if ((fd = open("/dev/tty", O_RDWR)) < 0)
+ if ((fd = open("/dev/tty", O_RDWR
|O_NOCTTY|O_NDELAY
)) < 0)
return -errno;
return -errno;
+ /* Temporarily ignore SIGHUP, so that we don't get SIGHUP'ed
+ * by our own TIOCNOTTY */
+
+ zero(sa_new);
+ sa_new.sa_handler = SIG_IGN;
+ sa_new.sa_flags = SA_RESTART;
+ assert_se(sigaction(SIGHUP, &sa_new, &sa_old) == 0);
+
if (ioctl(fd, TIOCNOTTY) < 0)
r = -errno;
if (ioctl(fd, TIOCNOTTY) < 0)
r = -errno;
+ assert_se(sigaction(SIGHUP, &sa_old, NULL) == 0);
+
close_nointr_nofail(fd);
return r;
}
close_nointr_nofail(fd);
return r;
}