Prevent spurious "/bsd.upgrade is not u+x" message when the file is missing.

ok kn@

diff --git a/sys/arch/octeon/stand/rdboot/cmd.c b/sys/arch/octeon/stand/rdboot/cmd.c
index 6bdbf0b..2b0a1c3 100644 (file)
--- a/sys/arch/octeon/stand/rdboot/cmd.c
+++ b/sys/arch/octeon/stand/rdboot/cmd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cmd.c,v 1.4 2023/10/20 19:55:49 kn Exp $      */
+/*     $OpenBSD: cmd.c,v 1.5 2024/08/08 13:59:11 miod Exp $    */
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -499,11 +499,12 @@ upgrade(void)
        path = disk_open(qualify("/bsd.upgrade"));
        if (path == NULL)
                return 0;
-       if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode))
+       if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode)) {
                ret = 1;
-       if ((sb.st_mode & S_IXUSR) == 0) {
-               printf("/bsd.upgrade is not u+x\n");
-               ret = 0;
+               if ((sb.st_mode & S_IXUSR) == 0) {
+                       printf("/bsd.upgrade is not u+x\n");
+                       ret = 0;
+               }
        }
        disk_close();
 

diff --git a/sys/arch/powerpc64/stand/rdboot/cmd.c b/sys/arch/powerpc64/stand/rdboot/cmd.c
index 21f326a..1172a14 100644 (file)
--- a/sys/arch/powerpc64/stand/rdboot/cmd.c
+++ b/sys/arch/powerpc64/stand/rdboot/cmd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cmd.c,v 1.2 2023/10/20 19:58:16 kn Exp $      */
+/*     $OpenBSD: cmd.c,v 1.3 2024/08/08 13:59:11 miod Exp $    */
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -499,11 +499,12 @@ upgrade(void)
        path = disk_open(qualify("/bsd.upgrade"));
        if (path == NULL)
                return 0;
-       if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode))
+       if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode)) {
                ret = 1;
-       if ((sb.st_mode & S_IXUSR) == 0) {
-               printf("/bsd.upgrade is not u+x\n");
-               ret = 0;
+               if ((sb.st_mode & S_IXUSR) == 0) {
+                       printf("/bsd.upgrade is not u+x\n");
+                       ret = 0;
+               }
        }
        disk_close();