lib/posix-tty: Give names to initial stdin/out

This change gives the initial files 0 and 1 the names "stdin" and
"stdout", respectively, with initial fd 2 remaining a duplicate of 1.

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Approved-by: Sergiu Moga <sergiu@unikraft.io>
Reviewed-by: Sergiu Moga <sergiu@unikraft.io>
GitHub-Closes: #1592

diff --git a/lib/posix-tty/tty.c b/lib/posix-tty/tty.c
index a414e2aa79389be4698058e7ed69f86feec2c21c..6b02ff9faeb45ed690cdc58f1ec8a39e557384f5 100644 (file)
--- a/lib/posix-tty/tty.c
+++ b/lib/posix-tty/tty.c
@@ -11,37 +11,68 @@
 #include <uk/posix-pseudofile.h>
 #include <uk/posix-serialfile.h>
 
+#define STDIN_FNAME_NULL "stdin:null"
+#define STDIN_FNAME_LEN_NULL (sizeof(STDIN_FNAME_NULL) - 1)
+
+#define STDIN_FNAME_VOID "stdin:void"
+#define STDIN_FNAME_LEN_VOID (sizeof(STDIN_FNAME_VOID) - 1)
+
+#define STDIN_FNAME_SERIAL "stdin:serial"
+#define STDIN_FNAME_LEN_SERIAL (sizeof(STDIN_FNAME_SERIAL) - 1)
+
+#define STDOUT_FNAME_NULL "stdout:null"
+#define STDOUT_FNAME_LEN_NULL (sizeof(STDOUT_FNAME_NULL) - 1)
+
+#define STDOUT_FNAME_SERIAL "stdout:serial"
+#define STDOUT_FNAME_LEN_SERIAL (sizeof(STDOUT_FNAME_SERIAL) - 1)
+
 static int init_posix_tty(struct uk_init_ctx *ictx __unused)
 {
        const struct uk_file *in;
        const struct uk_file *out;
+       const char *in_fname;
+       const char *out_fname;
+       size_t in_fnamelen;
+       size_t out_fnamelen;
        int r;
 
 #if CONFIG_LIBPOSIX_TTY_STDIN_NULL
        in = uk_nullfile_create();
+       in_fname = STDIN_FNAME_NULL;
+       in_fnamelen = STDIN_FNAME_LEN_NULL;
 #elif CONFIG_LIBPOSIX_TTY_STDIN_VOID
        in = uk_voidfile_create();
+       in_fname = STDIN_FNAME_VOID;
+       in_fnamelen = STDIN_FNAME_LEN_VOID;
 #elif CONFIG_LIBPOSIX_TTY_STDIN_SERIAL
        in = uk_serialfile_create();
+       in_fname = STDIN_FNAME_SERIAL;
+       in_fnamelen = STDIN_FNAME_LEN_SERIAL;
 #else /* !CONFIG_LIBPOSIX_TTY_STDIN_* */
-       #error Nonexistent stdin file
-#endif
+#error Nonexistent stdin file
+#endif /* !CONFIG_LIBPOSIX_TTY_STDIN_* */
 
 #if CONFIG_LIBPOSIX_TTY_STDOUT_NULL
        out = uk_nullfile_create();
+       out_fname = STDOUT_FNAME_NULL;
+       out_fnamelen = STDOUT_FNAME_LEN_NULL;
 #elif CONFIG_LIBPOSIX_TTY_STDOUT_SERIAL
        out = uk_serialfile_create();
+       out_fname = STDOUT_FNAME_SERIAL;
+       out_fnamelen = STDOUT_FNAME_LEN_SERIAL;
 #else /* !CONFIG_LIBPOSIX_TTY_STDOUT_* */
-       #error Nonexistent stdout file
-#endif
+#error Nonexistent stdout file
+#endif /* !CONFIG_LIBPOSIX_TTY_STDOUT_* */
 
-       r = uk_fdtab_open(in, O_RDONLY|UKFD_O_NOSEEK);
+       r = uk_fdtab_open_named(in, O_RDONLY | UKFD_O_NOSEEK,
+                               in_fname, in_fnamelen);
        if (unlikely(r != 0)) {
                uk_pr_err("Failed to allocate fd for stdin: %d\n", r);
                return (r < 0) ? r : -EBADF;
        }
 
-       r = uk_fdtab_open(out, O_WRONLY|UKFD_O_NOSEEK);
+       r = uk_fdtab_open_named(out, O_WRONLY | UKFD_O_NOSEEK,
+                               out_fname, out_fnamelen);
        if (unlikely(r != 1)) {
                uk_pr_err("Failed to allocate fd for stdout: %d\n", r);
                return (r < 0) ? r : -EBADF;