Fix typo

configure

@@ -4225,7 +4225,7 @@ then :
 fi
 
 
-VERSION=04.03.00
+VERSION=04.03.02
 
 
 

configure.in

@@ -88,7 +88,7 @@ if test "$?" != 0 ; then
 fi
 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups inotify_init1)
 
-VERSION=04.03.00
+VERSION=04.03.02
 AC_SUBST(VERSION)
 AC_SUBST(PERL)
 AC_SUBST(PERLARTIFACTS)

docs/WHATSNEW

@@ -1,5 +1,20 @@
 CHANGES TO REMIND
 
+* VERSION 4.3 Patch 2 - 2024-03-01
+
+- BUG FIX: remind: Fix a logic error when implementing the RUN command in
+  server mode.  As it turns out, the error is harmless, but it's best to do
+  things correctly.
+
+- BUG FIX: The Makefile would install the tkremind.png and tkremind.desktop
+  files in the wrong location.  This has been fixed.
+
+* VERSION 4.3 Patch 1 - 2024-02-29
+
+- BUG FIX: tests:  "make test" could fail because of a bad test.  This
+  has been fixed.  There are no actual code changes to any of the programs
+  in Remind compared to 04.03.00.
+
 * VERSION 4.3 Patch 0 - 2024-02-29
 
 - IMPROVEMENT: remind: If Remind is compiled on a system that supports

src/Makefile.in

@@ -63,14 +63,14 @@ install: all
 	done
 	-mkdir -p $(DESTDIR)$(datarootdir)/remind || true
 	cp -R ../include/* $(DESTDIR)$(datarootdir)/remind
-	-mkdir -p $(DESTDIR)$(prefix)/icons
-	-mkdir -p $(DESTDIR)$(prefix)/applications
-	$(INSTALL_DATA) $(srcdir)/../resources/tkremind.png $(DESTDIR)$(prefix)/icons
-	$(INSTALL_PROGRAM) $(srcdir)/../resources/tkremind.desktop $(DESTDIR)$(prefix)/applications
+	-mkdir -p $(DESTDIR)$(prefix)/share/pixmaps
+	-mkdir -p $(DESTDIR)$(prefix)/share/applications
+	$(INSTALL_DATA) $(srcdir)/../resources/tkremind.png $(DESTDIR)$(prefix)/share/pixmaps
+	$(INSTALL_PROGRAM) $(srcdir)/../resources/tkremind.desktop $(DESTDIR)$(prefix)/share/applications
 	-if test "$(DESTDIR)" = ""; then \
 	    update-desktop-database < /dev/null > /dev/null 2>&1 ; \
-	    xdg-icon-resource install --novendor --size 64 $(DESTDIR)$(prefix)/icons/tkremind.png < /dev/null > /dev/null 2>&1; \
-	    xdg-desktop-menu install --novendor $(DESTDIR)$(prefix)/applications/tkremind.desktop < /dev/null > /dev/null 2>&1 ; \
+	    xdg-icon-resource install --novendor --size 64 $(DESTDIR)$(prefix)/share/pixmaps/tkremind.png < /dev/null > /dev/null 2>&1; \
+	    xdg-desktop-menu install --novendor $(DESTDIR)$(prefix)/share/applications/tkremind.desktop < /dev/null > /dev/null 2>&1 ; \
         fi
 
 install-stripped: install

src/main.c

@@ -1666,7 +1666,9 @@ System(char const *cmd, int is_queued)
     pid_t kid;
     int fd;
     int status;
+    int do_exit = 0;
     if (is_queued && IsServerMode()) {
+        do_exit = 1;
         /* Server mode... redirect stdin and stdout to /dev/null */
         kid = fork();
         if (kid == (pid_t) -1) {
@@ -1696,6 +1698,11 @@ System(char const *cmd, int is_queued)
     }
     /* This is the child process or original if we never forked */
     r = system(cmd);
+    if (do_exit) {
+        /* In the child process, so exit! */
+        exit(0);
+    }
+
     if (r == 0) {
         return;
     }

tests/test-rem

@@ -537,7 +537,7 @@ REM Friday 29 Feb 2025 MSG four
 EOF
 
 
-(echo 'BANNER %'; echo 'REM 29 MSG No bug') | ../src/remind -dt - >> ../tests/test.out 2>&1
+(echo 'BANNER %'; echo 'REM 29 MSG No bug') | ../src/remind -dt - 29 Feb 2024 >> ../tests/test.out 2>&1
 
 # Remove references to SysInclude, which is build-specific
 grep -F -v '$SysInclude' < ../tests/test.out > ../tests/test.out.1 && mv -f ../tests/test.out.1 ../tests/test.out

tests/test.cmp

@@ -1060,7 +1060,7 @@ set a057 value("a05"+"6")
 "a05" + "6" => "a056"
 value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 set a058 version()
-version() => "04.03.00"
+version() => "04.03.02"
 set a059 wkday(today())
 today() => 1991-02-16
 wkday(1991-02-16) => "Saturday"
@@ -2648,7 +2648,7 @@ a086  4
 a109  2012-01-01
 a128  2018-02-03@16:45
 a039  "February"
-a058  "04.03.00"
+a058  "04.03.02"
 a077  "1992 92\n"
 a096  -4
 a119  -1
@@ -11743,7 +11743,7 @@ Can't open file: include_dir/ww
 Error reading include_dir/ww: Can't open file
 SECURITY: Won't read world-writable file or directory!
 Error reading include_dir/ww: No files matching *.rem
-04.03.00
+04.03.02
 NOTE JSONQUEUE
 [{"priority":2,"eventstart":"VOLATILE","time":"23:59","nexttime":"23:59","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue2.rem","lineno":1,"type":"MSG_TYPE","body":"XXXX"},{"priority":999,"eventstart":"VOLATILE","time":"23:58","nexttime":"23:58","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":5,"type":"MSG_TYPE","body":"quux"},{"priority":42,"eventstart":"VOLATILE","time":"23:57","nexttime":"23:57","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":4,"type":"MSG_TYPE","body":"bar"},{"priority":5000,"eventstart":"VOLATILE","time":"23:56","nexttime":"23:56","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":3,"type":"MSG_TYPE","body":"foo"}]
 NOTE ENDJSONQUEUE