You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
188 lines
5.6 KiB
188 lines
5.6 KiB
From c0572cecbeadc8fe24c70c5c39d49210a39ac719 Mon Sep 17 00:00:00 2001
|
|
From: Timothy Gu <timothygu99@gmail.com>
|
|
Date: Tue, 30 Sep 2014 10:32:33 -0700
|
|
Subject: [PATCH 1/2] signals: safeguard the remaining usage of frequently
|
|
missing signals
|
|
|
|
diff --git a/input.c b/input.c
|
|
index 117dfe8..465f0b9 100644
|
|
--- a/input.c
|
|
+++ b/input.c
|
|
@@ -532,9 +532,17 @@ rl_getc (stream)
|
|
Otherwise (not EINTR), some error occurred, also signifying EOF. */
|
|
if (errno != EINTR)
|
|
return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
|
|
- else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
|
|
+ else if (_rl_caught_signal == SIGTERM
|
|
+#if defined(SIGHUP)
|
|
+ || _rl_caught_signal == SIGHUP
|
|
+#endif
|
|
+ )
|
|
return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
|
|
- else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
|
|
+ else if (_rl_caught_signal == SIGINT
|
|
+#if defined(SIGQUIT)
|
|
+ || _rl_caught_signal == SIGQUIT
|
|
+#endif
|
|
+ )
|
|
RL_CHECK_SIGNALS ();
|
|
|
|
if (rl_signal_event_hook)
|
|
diff --git a/signals.c b/signals.c
|
|
index 61f02f9..7c921d6 100644
|
|
--- a/signals.c
|
|
+++ b/signals.c
|
|
@@ -216,7 +216,9 @@ _rl_handle_signal (sig)
|
|
/* FALLTHROUGH */
|
|
|
|
case SIGTERM:
|
|
+#if defined (SIGHUP)
|
|
case SIGHUP:
|
|
+#endif
|
|
#if defined (SIGTSTP)
|
|
case SIGTSTP:
|
|
case SIGTTOU:
|
|
@@ -426,7 +428,9 @@ rl_set_signals ()
|
|
|
|
rl_maybe_set_sighandler (SIGINT, rl_signal_handler, &old_int);
|
|
rl_maybe_set_sighandler (SIGTERM, rl_signal_handler, &old_term);
|
|
+#if defined (SIGHUP)
|
|
rl_maybe_set_sighandler (SIGHUP, rl_signal_handler, &old_hup);
|
|
+#endif
|
|
#if defined (SIGQUIT)
|
|
rl_maybe_set_sighandler (SIGQUIT, rl_signal_handler, &old_quit);
|
|
#endif
|
|
@@ -491,7 +495,9 @@ rl_clear_signals ()
|
|
overhead */
|
|
rl_maybe_restore_sighandler (SIGINT, &old_int);
|
|
rl_maybe_restore_sighandler (SIGTERM, &old_term);
|
|
+#if defined (SIGHUP)
|
|
rl_maybe_restore_sighandler (SIGHUP, &old_hup);
|
|
+#endif
|
|
#if defined (SIGQUIT)
|
|
rl_maybe_restore_sighandler (SIGQUIT, &old_quit);
|
|
#endif
|
|
--
|
|
1.8.3.2
|
|
|
|
|
|
From 6896ffa4fc85bf0dfae58e69a860d2076c1d9fd2 Mon Sep 17 00:00:00 2001
|
|
From: Timothy Gu <timothygu99@gmail.com>
|
|
Date: Tue, 30 Sep 2014 17:16:32 -0700
|
|
Subject: [PATCH 2/2] Handle missing S_IS* macros more gracefully
|
|
|
|
diff --git a/colors.c b/colors.c
|
|
index 89d9035..ec19844 100644
|
|
--- a/colors.c
|
|
+++ b/colors.c
|
|
@@ -152,14 +152,22 @@ _rl_print_color_indicator (char *f)
|
|
{
|
|
colored_filetype = C_FILE;
|
|
|
|
+#if defined (S_ISUID)
|
|
if ((mode & S_ISUID) != 0 && is_colored (C_SETUID))
|
|
colored_filetype = C_SETUID;
|
|
- else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
|
|
+ else
|
|
+#endif
|
|
+#if defined (S_ISGID)
|
|
+ if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
|
|
colored_filetype = C_SETGID;
|
|
- else if (is_colored (C_CAP) && 0) //f->has_capability)
|
|
+ else
|
|
+#endif
|
|
+ if (is_colored (C_CAP) && 0) //f->has_capability)
|
|
colored_filetype = C_CAP;
|
|
+#if defined(S_IXUGO)
|
|
else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC))
|
|
colored_filetype = C_EXEC;
|
|
+#endif
|
|
else if ((1 < astat.st_nlink) && is_colored (C_MULTIHARDLINK))
|
|
colored_filetype = C_MULTIHARDLINK;
|
|
}
|
|
@@ -173,8 +181,10 @@ _rl_print_color_indicator (char *f)
|
|
colored_filetype = C_STICKY_OTHER_WRITABLE;
|
|
else
|
|
#endif
|
|
+#if defined (S_IWOTH)
|
|
if ((mode & S_IWOTH) != 0 && is_colored (C_OTHER_WRITABLE))
|
|
colored_filetype = C_OTHER_WRITABLE;
|
|
+#endif
|
|
#if defined (S_ISVTX)
|
|
else if ((mode & S_ISVTX) != 0 && is_colored (C_STICKY))
|
|
colored_filetype = C_STICKY;
|
|
diff --git a/colors.h b/colors.h
|
|
index fc926e5..e62edd0 100644
|
|
--- a/colors.h
|
|
+++ b/colors.h
|
|
@@ -96,7 +96,7 @@ enum indicator_no
|
|
};
|
|
|
|
|
|
-#if !S_IXUGO
|
|
+#if !S_IXUGO && defined(S_IXUSR) && defined(S_IXGRP) && defined(S_IXOTH)
|
|
# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
|
|
#endif
|
|
|
|
diff --git a/posixstat.h b/posixstat.h
|
|
index 3eb7f29..854a2c9 100644
|
|
--- a/posixstat.h
|
|
+++ b/posixstat.h
|
|
@@ -78,30 +78,44 @@
|
|
|
|
#if defined (S_IFBLK) && !defined (S_ISBLK)
|
|
#define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */
|
|
+#elif !defined (S_IFBLK)
|
|
+#define S_ISBLK(m) 0
|
|
#endif
|
|
|
|
#if defined (S_IFCHR) && !defined (S_ISCHR)
|
|
#define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */
|
|
+#elif !defined (S_IFCHR)
|
|
+#define S_ISCHR(m) 0
|
|
#endif
|
|
|
|
#if defined (S_IFDIR) && !defined (S_ISDIR)
|
|
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */
|
|
+#elif !defined (S_IFDIR)
|
|
+#define S_ISDIR(m) 0
|
|
#endif
|
|
|
|
#if defined (S_IFREG) && !defined (S_ISREG)
|
|
#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */
|
|
+#elif !defined (S_IFREG)
|
|
+#define S_ISREG(m) 0
|
|
#endif
|
|
|
|
#if defined (S_IFIFO) && !defined (S_ISFIFO)
|
|
#define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */
|
|
+#elif !defined (S_IFIFO)
|
|
+#define S_ISFIFO(m) 0
|
|
#endif
|
|
|
|
#if defined (S_IFLNK) && !defined (S_ISLNK)
|
|
#define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */
|
|
+#elif !defined (S_IFLNK)
|
|
+#define S_ISLNK(m) 0
|
|
#endif
|
|
|
|
#if defined (S_IFSOCK) && !defined (S_ISSOCK)
|
|
#define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */
|
|
+#elif !defined (S_IFSOCK)
|
|
+#define S_ISSOCK(m) 0
|
|
#endif
|
|
|
|
/*
|
|
@@ -137,6 +151,8 @@
|
|
/* These are non-standard, but are used in builtins.c$symbolic_umask() */
|
|
#define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH)
|
|
#define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH)
|
|
+#if defined(S_IXUSR) && defined(S_IXGRP) && defined(S_IXOTH)
|
|
#define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
|
|
+#endif
|
|
|
|
#endif /* _POSIXSTAT_H_ */
|
|
--
|
|
1.8.3.2
|
|
|