2 files changed, 18 insertions, 4 deletions

diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index 858429ac2..b997194ad 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -62,6 +63,7 @@ int main(int argc, char **argv)
 {
         int i, j;
         unsigned MAX_APPLET_NAME_LEN = 1;
+        char tmp1[PATH_MAX], tmp2[PATH_MAX];
 
         // In find_applet_by_name(), before linear search, narrow it down
         // by looking at N "equidistant" names. With ~350 applets:
@@ -85,7 +87,8 @@ int main(int argc, char **argv)
 
         if (!argv[1])
                 return 1;
-        i = open(argv[1], O_WRONLY | O_TRUNC | O_CREAT, 0666);
+        snprintf(tmp1, PATH_MAX, "%s.%u.new", argv[1], (int) getpid());
+        i = open(tmp1, O_WRONLY | O_TRUNC | O_CREAT, 0666);
         if (i < 0)
                 return 1;
         dup2(i, 1);
@@ -210,12 +213,21 @@ int main(int argc, char **argv)
 //                      fclose(fp);
 //              }
 //              if (strcmp(line_old, line_new) != 0) {
-                        fp = fopen(argv[2], "w");
+                        snprintf(tmp2, PATH_MAX, "%s.%u.new", argv[2], (int) getpid());
+                        fp = fopen(tmp2, "w");
                         if (!fp)
                                 return 1;
                         fputs(line_new, fp);
+                        if (fclose(fp))
+                                return 1;
 //              }
         }
 
+        if (fclose(stdout))
+                return 1;
+        if (rename(tmp1, argv[1]))
+                return 1;
+        if (rename(tmp2, argv[2]))
+                return 1;
         return 0;
 }
diff --git a/applets/install.sh b/applets/install.sh
index c75a78e9d..9aede0f53 100755
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -5,7 +5,9 @@ export LC_CTYPE=POSIX
 
 prefix=$1
 if [ -z "$prefix" ]; then
-        echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]"
+        echo "usage: applets/install.sh DESTINATION TYPE [OPTS ...]"
+        echo "  TYPE is one of: --symlinks --hardlinks --binaries --scriptwrapper --none"
+        echo "  OPTS is one or more of: --cleanup --noclobber"
         exit 1
 fi
 shift # Keep only remaining options
@@ -32,7 +34,7 @@ while [ ${#} -gt 0 ]; do
                 --sw-sh-sym)     scriptwrapper="y"; linkopts="-fs";;
                 --cleanup)       cleanup="1";;
                 --noclobber)     noclobber="1";;
-                "")              h="";;
+                --none)          h="";;
                 *)               echo "Unknown install option: $1"; exit 1;;
         esac
         shift