#define open O_* flags in libsa/stand.h, so that bootblocks can use

O_RDONLY rather using 0
ok beck

diff --git a/sys/arch/amd64/stand/efi32/exec_i386.c b/sys/arch/amd64/stand/efi32/exec_i386.c
index 7e7aa4a..8349d97 100644 (file)
--- a/sys/arch/amd64/stand/efi32/exec_i386.c
+++ b/sys/arch/amd64/stand/efi32/exec_i386.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_i386.c,v 1.2 2019/05/11 19:14:41 mlarkin Exp $   */
+/*     $OpenBSD: exec_i386.c,v 1.3 2021/10/24 17:49:19 deraadt Exp $   */
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -180,7 +180,7 @@ ucode_load(void)
        snprintf(path, sizeof(path), "%s:/etc/firmware/intel/%02x-%02x-%02x",
            cmd.bootdev, family, model, stepping);
 
-       fd = open(path, 0);
+       fd = open(path, O_RDONLY);
        if (fd == -1)
                return;
 

diff --git a/sys/arch/amd64/stand/efi64/exec_i386.c b/sys/arch/amd64/stand/efi64/exec_i386.c
index e8e1d60..48e460c 100644 (file)
--- a/sys/arch/amd64/stand/efi64/exec_i386.c
+++ b/sys/arch/amd64/stand/efi64/exec_i386.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_i386.c,v 1.2 2019/05/11 19:14:41 mlarkin Exp $   */
+/*     $OpenBSD: exec_i386.c,v 1.3 2021/10/24 17:49:19 deraadt Exp $   */
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -179,7 +179,7 @@ ucode_load(void)
        snprintf(path, sizeof(path), "%s:/etc/firmware/intel/%02x-%02x-%02x",
            cmd.bootdev, family, model, stepping);
 
-       fd = open(path, 0);
+       fd = open(path, O_RDONLY);
        if (fd == -1)
                return;
 

diff --git a/sys/arch/amd64/stand/efiboot/exec_i386.c b/sys/arch/amd64/stand/efiboot/exec_i386.c
index 56afe72..ea8fa67 100644 (file)
--- a/sys/arch/amd64/stand/efiboot/exec_i386.c
+++ b/sys/arch/amd64/stand/efiboot/exec_i386.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_i386.c,v 1.6 2021/06/07 00:04:20 krw Exp $       */
+/*     $OpenBSD: exec_i386.c,v 1.7 2021/10/24 17:49:19 deraadt Exp $   */
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -203,7 +203,7 @@ ucode_load(void)
        snprintf(path, sizeof(path), "%s:/etc/firmware/intel/%02x-%02x-%02x",
            cmd.bootdev, family, model, stepping);
 
-       fd = open(path, 0);
+       fd = open(path, O_RDONLY);
        if (fd == -1)
                return;
 

diff --git a/sys/arch/amd64/stand/libsa/exec_i386.c b/sys/arch/amd64/stand/libsa/exec_i386.c
index 6f66392..2206793 100644 (file)
--- a/sys/arch/amd64/stand/libsa/exec_i386.c
+++ b/sys/arch/amd64/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_i386.c,v 1.34 2021/06/05 13:32:52 deraadt Exp $  */
+/*     $OpenBSD: exec_i386.c,v 1.35 2021/10/24 17:49:19 deraadt Exp $  */
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -217,7 +217,7 @@ ucode_load(void)
        snprintf(path, sizeof(path), "%s:/etc/firmware/intel/%02x-%02x-%02x",
            cmd.bootdev, family, model, stepping);
 
-       fd = open(path, 0);
+       fd = open(path, O_RDONLY);
        if (fd == -1)
                return;
 

diff --git a/sys/arch/i386/stand/libsa/exec_i386.c b/sys/arch/i386/stand/libsa/exec_i386.c
index 97674e6..e89955f 100644 (file)
--- a/sys/arch/i386/stand/libsa/exec_i386.c
+++ b/sys/arch/i386/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_i386.c,v 1.50 2019/06/08 02:52:20 jsg Exp $      */
+/*     $OpenBSD: exec_i386.c,v 1.51 2021/10/24 17:49:19 deraadt Exp $  */
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -216,7 +216,7 @@ ucode_load(void)
        snprintf(path, sizeof(path), "%s:/etc/firmware/intel/%02x-%02x-%02x",
            cmd.bootdev, family, model, stepping);
 
-       fd = open(path, 0);
+       fd = open(path, O_RDONLY);
        if (fd == -1)
                return;
 

diff --git a/sys/arch/landisk/stand/xxboot/boot1.c b/sys/arch/landisk/stand/xxboot/boot1.c
index 29c1dcd..b4e0c6e 100644 (file)
--- a/sys/arch/landisk/stand/xxboot/boot1.c
+++ b/sys/arch/landisk/stand/xxboot/boot1.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: boot1.c,v 1.9 2020/12/09 18:10:19 krw Exp $   */
+/*     $OpenBSD: boot1.c,v 1.10 2021/10/24 17:49:19 deraadt Exp $      */
 /*     $NetBSD: boot1.c,v 1.1 2006/09/01 21:26:19 uwe Exp $    */
 
 /*-
@@ -86,7 +86,7 @@ boot1(uint32_t *sector)
 
                bios_sector = ptn_disklabel.d_partitions[0].p_offset;
                *sector = bios_sector;
-               fd = open("boot", 0);
+               fd = open("boot", O_RDONLY);
        } while (0);
 
        if (fd == -1 || fstat(fd, &sb) == -1)

diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c
index 2ecdd06..9263c52 100644 (file)
--- a/sys/arch/sparc64/stand/ofwboot/boot.c
+++ b/sys/arch/sparc64/stand/ofwboot/boot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: boot.c,v 1.36 2021/01/30 21:06:45 deraadt Exp $       */
+/*     $OpenBSD: boot.c,v 1.37 2021/10/24 17:49:19 deraadt Exp $       */
 /*     $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $     */
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -483,7 +483,7 @@ main(void)
                rc4_keysetup(&randomctx, rnddata, sizeof rnddata);
                rc4_skip(&randomctx, 1536);
 
-               if ((fd = open(bootline, 0)) < 0) {
+               if ((fd = open(bootline, O_RDONLY)) < 0) {
                        printf("open %s: %s\n", opened_name, strerror(errno));
                        continue;
                }

diff --git a/sys/lib/libsa/loadfile.c b/sys/lib/libsa/loadfile.c
index 5d7d37c..5dc5801 100644 (file)
--- a/sys/lib/libsa/loadfile.c
+++ b/sys/lib/libsa/loadfile.c
@@ -1,5 +1,5 @@
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile.c,v 1.20 2019/04/10 04:17:37 deraadt Exp $ */
+/* $OpenBSD: loadfile.c,v 1.21 2021/10/24 17:49:19 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@ loadfile(const char *fname, uint64_t *marks, int flags)
        int fd, rval;
 
        /* Open the file. */
-       if ((fd = open(fname, 0)) < 0) {
+       if ((fd = open(fname, O_RDONLY)) < 0) {
                WARN(("open %s", fname ? fname : "<default>"));
                return -1;
        }

diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index 8419a0a..9720fe6 100644 (file)
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: stand.h,v 1.70 2020/12/09 18:10:19 krw Exp $  */
+/*     $OpenBSD: stand.h,v 1.71 2021/10/24 17:49:19 deraadt Exp $      */
 /*     $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $   */
 
 /*-
@@ -159,6 +159,9 @@ long long   strtoll(const char *, char **, int);
 char   *strchr(const char *, int);
 void   *memset(void *, int, size_t);
 void   exit(void);
+#define O_RDONLY        0x0000          /* open for reading only */
+#define O_WRONLY        0x0001          /* open for writing only */
+#define O_RDWR          0x0002          /* open for reading and writing */
 int    open(const char *, int);
 int    close(int);
 void   closeall(void);

diff --git a/sys/lib/libsa/stat.c b/sys/lib/libsa/stat.c
index 013dd06..8db5bb6 100644 (file)
--- a/sys/lib/libsa/stat.c
+++ b/sys/lib/libsa/stat.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: stat.c,v 1.6 2003/08/11 06:23:09 deraadt Exp $        */
+/*     $OpenBSD: stat.c,v 1.7 2021/10/24 17:49:19 deraadt Exp $        */
 /*     $NetBSD: stat.c,v 1.3 1994/10/26 05:45:07 cgd Exp $     */
 
 /*-
@@ -42,7 +42,7 @@ stat(const char *str, struct stat *sb)
 #ifdef __INTERNAL_LIBSA_CREAD
        if ((fd = oopen(str, 0)) < 0)
 #else
-       if ((fd = open(str, 0)) < 0)
+       if ((fd = open(str, O_RDONLY)) < 0)
 #endif
                return (-1);
        rv = fstat(fd, sb);

diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c
index 8b5bbb7..020f769 100644 (file)
--- a/sys/stand/boot/boot.c
+++ b/sys/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: boot.c,v 1.54 2020/06/15 14:43:57 naddy Exp $ */
+/*     $OpenBSD: boot.c,v 1.55 2021/10/24 17:49:19 deraadt Exp $       */
 
 /*
  * Copyright (c) 2003 Dale Rahn
@@ -168,8 +168,6 @@ loadrandom(char *name, char *buf, size_t buflen)
        struct stat sb;
        int fd, i, error = 0;
 
-#define O_RDONLY       0
-
        /* Extract the device name from the kernel we are loading. */
        for (i = 0; i < sizeof(cmd.path); i++) {
                if (cmd.path[i] == ':') {

diff --git a/sys/stand/boot/cmd.c b/sys/stand/boot/cmd.c
index 7b613ff..b11f454 100644 (file)
--- a/sys/stand/boot/cmd.c
+++ b/sys/stand/boot/cmd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cmd.c,v 1.67 2019/12/02 01:38:06 deraadt Exp $        */
+/*     $OpenBSD: cmd.c,v 1.68 2021/10/24 17:49:19 deraadt Exp $        */
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -110,7 +110,7 @@ read_conf(void)
        }
 #endif
 
-       if ((fd = open(qualify(cmd.conf), 0)) < 0) {
+       if ((fd = open(qualify(cmd.conf), O_RDONLY)) < 0) {
                if (errno != ENOENT && errno != ENXIO) {
                        printf("open(%s): %s\n", cmd.path, strerror(errno));
                        return 0;