Changeset 3473 in kBuild for trunk

Timestamp:

Sep 16, 2020 9:12:58 PM (4 years ago)

Author:

bird

Message:

kash: Added two specialized shfile_stat variants: shfile_stat_isreg, shfile_stat_exists. Increased the pipe size for windows to 64KB (SHFILE_PIPE_SIZE).

Location:

trunk/src/kash

Files:

• redir.c (modified) (1 diff)
• shfile.c (modified) (3 diffs)
• shfile.h (modified) (3 diffs)

trunk/src/kash/redir.c

@@ -67 +67 @@
 
 #define EMPTY -2                /* marks an unused slot in redirtab */
-#ifndef PIPE_BUF
-# define PIPESIZE 4096          /* amount of buffering in a pipe */
-#else
-# define PIPESIZE PIPE_BUF
-#endif
+#define PIPESIZE SHFILE_PIPE_SIZE
 
 

trunk/src/kash/shfile.c

@@ -36 +36 @@
 
 #if K_OS == K_OS_WINDOWS
-# include <limits.h>
-# ifndef PIPE_BUF
-#  define PIPE_BUF 512
-# endif
 # include <ntstatus.h>
 # define WIN32_NO_STATUS
@@ -1711 +1707 @@
 
     fds[1] = fds[0] = -1;
-    if (CreatePipe(&hRead, &hWrite, &SecurityAttributes, 4096))
+    if (CreatePipe(&hRead, &hWrite, &SecurityAttributes, SHFILE_PIPE_SIZE))
     {
         fds[0] = shfile_insert(pfdtab, (intptr_t)hRead, O_RDONLY, SHFILE_FLAGS_PIPE, -1, "shfile_pipe", "pipe-rd");
@@ -2193 +2189 @@
 #else
     return stat(path, pst);
+#endif
+}
+
+/**
+ * @retval 1 if regular file.
+ * @retval 0 if found but not a regular file.
+ * @retval -1 and errno on failure
+ */
+int shfile_stat_isreg(shfdtab *pfdtab, const char *path)
+{
+#if defined(SHFILE_IN_USE) && K_OS == K_OS_WINDOWS
+    char    abspath[SHFILE_MAX_PATH];
+    KU16    mode = 0;
+    int     rc = shfile_make_path(pfdtab, path, &abspath[0]);
+    if (!rc)
+    {
+        rc = birdStatModeOnly(abspath, &mode, 0 /*fFollowLink*/);
+        if (rc >= 0)
+            rc = S_ISREG(mode) ? 1 : 0;
+    }
+    TRACE2((NULL, "shfile_stat_isreg(,%s,) -> %d [%d] st_mode=%o\n", path, rc, errno, mode));
+    return rc;
+#else
+    struct stat st;
+    int rc = shfile_stat(pfdtab, path, &st);
+    if (rc >= 0)
+        rc = S_ISREG(st.st_mode) ? 1 : 0;
+    return rc;
+#endif
+}
+
+/**
+ * Same as shfile_stat, but without the data structure.
+ */
+int shfile_stat_exists(shfdtab *pfdtab, const char *path)
+{
+#if defined(SHFILE_IN_USE) && K_OS == K_OS_WINDOWS
+    char    abspath[SHFILE_MAX_PATH];
+    KU16    mode = 0;
+    int     rc = shfile_make_path(pfdtab, path, &abspath[0]);
+    if (!rc)
+        rc = birdStatModeOnly(abspath, &mode, 0 /*fFollowLink*/);
+    TRACE2((NULL, "shfile_stat_exists(,%s,) -> %d [%d] st_mode=%o\n", path, rc, errno, mode));
+    return rc;
+#else
+    struct stat ignored;
+    return shfile_stat(pfdtab, path, &ignored);
 #endif
 }

trunk/src/kash/shfile.h

@@ -47 +47 @@
 # endif
 #endif
+#include <limits.h> /* for PIPE_BUF */
 #ifndef _MSC_VER
 # include <fcntl.h>
@@ -160 +161 @@
 
 int shfile_open(shfdtab *, const char *, unsigned, mode_t);
+#if K_OS == K_OS_WINDOWS
+# define SHFILE_PIPE_SIZE   65536
+#elif defined(PIPE_BUF)
+# define SHFILE_PIPE_SIZE   PIPE_BUF
+#else
+# define SHFILE_PIPE_SIZE   4096
+#endif
 int shfile_pipe(shfdtab *, int [2]);
 int shfile_close(shfdtab *, unsigned);
@@ -171 +179 @@
 
 int shfile_stat(shfdtab *, const char *, struct stat *);
+int shfile_stat_isreg(shfdtab *, const char *);  /**< returns -1, 0 or 1. */
+int shfile_stat_exists(shfdtab *, const char *); /**< same as shfile_stat, but discards the stat data. */
 int shfile_lstat(shfdtab *, const char *, struct stat *);
 int shfile_chdir(shfdtab *, const char *);