ash: remove special treatment of device files

Since device files are now handled in mingw_open there's no need
for any special treatment in ash redirection.

2 files changed, 3 insertions, 21 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 394022df9..778d8bd9d 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5702,26 +5702,6 @@ openredirect(union node *redir)
          * allocated space. Do it only when we know it is safe.
          */
         fname = redir->nfile.expfname;
-#if ENABLE_PLATFORM_MINGW32
-        /* Support for /dev/null */
-        switch (redir->nfile.type) {
-                case NFROM:
-                case NFROMTO:
-                case NTO:
-#if BASH_REDIR_OUTPUT
-                case NTO2:
-#endif
-                case NCLOBBER:
-                case NAPPEND:
-                        if (!strncmp(fname, "/dev/", 5)) {
-                                if (!strcmp(fname+5, "null"))
-                                        return open(fname,O_RDWR);
-                                ash_msg_and_raise_error("Unhandled device %s\n", fname);
-                                return -1;
-                        }
-                        break;
-        }
-#endif
 
         switch (redir->nfile.type) {
         default:
diff --git a/win32/mingw.c b/win32/mingw.c
index 981c50415..7fe5a6f05 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -181,8 +181,10 @@ int mingw_open (const char *filename, int oflags, ...)
                                 devrand = 1;
                 }
 
-                if (devnull || devzero || devrand )
+                if (devnull || devzero || devrand ) {
                         filename = "nul";
+                        oflags = O_RDWR;
+                }
         }
         fd = open(filename, oflags, mode);
         if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) {