Implement simple emulation for the FIODTYPE ioctl(2). This

makes dd(1) happy among other things.

Author: sobomax

bsd-user/bsd-ioctl.c

@@ -202,22 +202,6 @@ STRUCT_MAX
 #undef STRUCT
 #undef STRUCT_SPECIAL
 
-
-struct IOCTLEntry;
-
-typedef abi_long do_ioctl_fn(const struct IOCTLEntry *ie, uint8_t *buf_temp,
-                int fd, abi_long cmd, abi_long arg);
-
-struct IOCTLEntry {
-    unsigned int target_cmd;
-    unsigned int host_cmd;
-    const char *name;
-    int access;
-    do_ioctl_fn *do_ioctl;
-    const argtype arg_type[5];
-};
-typedef struct IOCTLEntry IOCTLEntry;
-
 #define MAX_STRUCT_SIZE 4096
 
 #if !defined(__linux__)

bsd-user/bsd-ioctl.h

@@ -121,4 +121,19 @@ static const bitmask_transtbl lflag_tbl[] = {
     { EXTPROC, EXTPROC, HOST_EXTPROC, HOST_EXTPROC},
 };
 
+struct IOCTLEntry;
+
+typedef abi_long do_ioctl_fn(const struct IOCTLEntry *ie, uint8_t *buf_temp,
+                int fd, abi_long cmd, abi_long arg);
+
+struct IOCTLEntry {
+    unsigned int target_cmd;
+    unsigned int host_cmd;
+    const char *name;
+    int access;
+    do_ioctl_fn *do_ioctl;
+    const argtype arg_type[5];
+};
+typedef struct IOCTLEntry IOCTLEntry;
+
 #endif /* BSD_IOCTL_H */

bsd-user/freebsd/os-ioctl-cmds.h

@@ -59,6 +59,10 @@ IOCTL(FIOSETOWN, IOC_W, MK_PTR(TYPE_INT))
 IOCTL(FIOGETOWN, IOC_R, MK_PTR(TYPE_INT))
 #if !defined(__linux__)
 IOCTL(FIODTYPE, IOC_R, MK_PTR(TYPE_INT))
+#else
+IOCTL_SPECIAL_UNIMPL(FIODTYPE, IOC_R, do_ioctl_FIODTYPE)
+#endif
+#if !defined(__linux__)
 IOCTL(FIOGETLBA, IOC_R, MK_PTR(TYPE_INT))
 IOCTL(FIODGNAME, IOC_W, MK_PTR(MK_STRUCT(STRUCT_fiodgname_arg)))
 IOCTL(FIONWRITE, IOC_R, MK_PTR(TYPE_INT))

bsd-user/freebsd/os-ioctl-filio.h

@@ -43,4 +43,33 @@ struct target_fiodgname_arg {
 #define TARGET_FIOSEEKDATA  TARGET_IOWR('f', 97, off_t)
 #define TARGET_FIOSEEKHOLE  TARGET_IOWR('f', 98, off_t)
 
+#if defined(__linux__)
+static abi_long do_ioctl_FIODTYPE(__unused const IOCTLEntry *ie,
+                                  __unused uint8_t *buf_temp,
+                                  int fd, __unused abi_long cmd,
+                                  abi_long arg)
+{
+        abi_int *argptr;
+        int target_size = sizeof(abi_int);
+        struct stat st;
+        int res = 0;
+
+        argptr = lock_user(VERIFY_WRITE, arg, target_size, 0);
+        if (!argptr) {
+                return -TARGET_EFAULT;
+        }
+        if (fstat(fd, &st) != 0) {
+                return -TARGET_EBADF;
+        }
+        if (S_ISCHR(st.st_mode) && isatty(fd)) {
+                res = TARGET_D_TTY;
+        } else if (S_ISBLK(st.st_mode)) {
+                res = TARGET_D_DISK;
+        }
+        *argptr = res;
+        unlock_user(argptr, arg, target_size);
+        return 0;
+}
+#endif
+
 #endif /* BSD_USER_FREEBSD_OS_IOCTL_FILIO_H */

bsd-user/linux/target_os_defs.h

@@ -446,6 +446,14 @@ static const typeof(VTIME) HOST_VTIME = VTIME;
 #endif /* found in: sys/_termios.h */
 #undef VTIME
 #define VTIME		17	/* !ICANON */
+#if defined(TARGET_D_TTY)
+#undef TARGET_D_TTY
+#endif /* found in: sys/conf.h */
+#define TARGET_D_TTY	0x0004
+#if defined(TARGET_D_DISK)
+#undef TARGET_D_DISK
+#endif /* found in: sys/conf.h */
+#define TARGET_D_DISK	0x0002
 #if defined(TARGET_E2BIG)
 #undef TARGET_E2BIG
 #endif /* found in: sys/errno.h */