From a88a177f991527e545e75588013afd16c647e656 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 3 Jul 2008 13:11:47 +0000 Subject: Add older_than function to complement newer_than function. Also make the userland instance reversed to be compatable with current baselayout, which truely does suck. --- src/rc/rc-applets.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/rc/rc-applets.c') diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c index cbcbae4..77790e9 100644 --- a/src/rc/rc-applets.c +++ b/src/rc/rc-applets.c @@ -408,7 +408,7 @@ static int do_shell_var(int argc, char **argv) void run_applets(int argc, char **argv) { int i = 2; - bool match = false; + bool (*is_than) (const char *, const char *); char *p; pid_t pid = 0; @@ -437,18 +437,22 @@ void run_applets(int argc, char **argv) if (strcmp(applet, "shell_var") == 0) exit(do_shell_var(argc, argv)); + /* This test is perverted - historically the baselayout function + * returns 0 on *failure*, which is plain wrong */ if (strcmp(applet, "is_newer_than") == 0 || strcmp(applet, "is_older_than") == 0) { if (argc < 3) exit (EXIT_FAILURE); if (strcmp(applet, "is_newer_than") == 0) - match = true; + is_than = &rc_older_than; + else + is_than = &rc_newer_than; while (i < argc) { - if (rc_newer_than(argv[1], argv[i++]) != match) - exit (EXIT_FAILURE); + if (!is_than(argv[1], argv[i++])) + exit(EXIT_SUCCESS); } - exit(EXIT_SUCCESS); + exit(EXIT_FAILURE); }; if (applet[0] == 'e' || (applet[0] == 'v' && applet[1] == 'e')) -- cgit v1.2.3