Remove code which supports systems with long long off_t.

[strace] / term.c

diff --git a/term.c b/term.c
index e60f0ed3ba5f3948a1aea7227753f4b10de9ca42..7b7de7405307019f06246c7d35b24582a53d3426 100644 (file)
--- a/term.c
+++ b/term.c
@@ -23,23 +23,19 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *     $Id$
  */
 
 #include "defs.h"
-
-#ifdef HAVE_TERMIO_H
-#include <termio.h>
-#endif /* HAVE_TERMIO_H */
-
-#include <termios.h>
-
+/*
+ * The C library's definition of struct termios might differ from
+ * the kernel one, and we need to use the kernel layout.
+ */
+#include <linux/termios.h>
 #ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
+# include <sys/filio.h>
 #endif
 
-static struct xlat tcxonc_options[] = {
+static const struct xlat tcxonc_options[] = {
        { TCOOFF,       "TCOOFF"        },
        { TCOON,        "TCOON"         },
        { TCIOFF,       "TCIOFF"        },
@@ -47,14 +43,16 @@ static struct xlat tcxonc_options[] = {
        { 0,            NULL            },
 };
 
-static struct xlat tcflsh_options[] = {
+#ifdef TCLFLSH
+static const struct xlat tcflsh_options[] = {
        { TCIFLUSH,     "TCIFLUSH"      },
        { TCOFLUSH,     "TCOFLUSH"      },
        { TCIOFLUSH,    "TCIOFLUSH"     },
        { 0,            NULL            },
 };
+#endif
 
-static struct xlat baud_options[] = {
+static const struct xlat baud_options[] = {
        { B0,           "B0"            },
        { B50,          "B50"           },
        { B75,          "B75"           },
@@ -75,6 +73,51 @@ static struct xlat baud_options[] = {
 #ifdef B38400
        { B38400,       "B38400"        },
 #endif
+#ifdef B57600
+       { B57600,       "B57600"        },
+#endif
+#ifdef B115200
+       { B115200,      "B115200"       },
+#endif
+#ifdef B230400
+       { B230400,      "B230400"       },
+#endif
+#ifdef B460800
+       { B460800,      "B460800"       },
+#endif
+#ifdef B500000
+       { B500000,      "B500000"       },
+#endif
+#ifdef B576000
+       { B576000,      "B576000"       },
+#endif
+#ifdef B921600
+       { B921600,      "B921600"       },
+#endif
+#ifdef B1000000
+       { B1000000,     "B1000000"      },
+#endif
+#ifdef B1152000
+       { B1152000,     "B1152000"      },
+#endif
+#ifdef B1500000
+       { B1500000,     "B1500000"      },
+#endif
+#ifdef B2000000
+       { B2000000,     "B2000000"      },
+#endif
+#ifdef B2500000
+       { B2500000,     "B2500000"      },
+#endif
+#ifdef B3000000
+       { B3000000,     "B3000000"      },
+#endif
+#ifdef B3500000
+       { B3500000,     "B3500000"      },
+#endif
+#ifdef B4000000
+       { B4000000,     "B4000000"      },
+#endif
 #ifdef EXTA
        { EXTA,         "EXTA"          },
 #endif
@@ -84,7 +127,7 @@ static struct xlat baud_options[] = {
        { 0,            NULL            },
 };
 
-static struct xlat modem_flags[] = {
+static const struct xlat modem_flags[] = {
 #ifdef TIOCM_LE
        { TIOCM_LE,     "TIOCM_LE",     },
 #endif
@@ -121,11 +164,7 @@ static struct xlat modem_flags[] = {
        { 0,            NULL,           },
 };
 
-
-int
-term_ioctl(tcp, code, arg)
-struct tcb *tcp;
-long code, arg;
+int term_ioctl(struct tcb *tcp, long code, long arg)
 {
        struct termios tios;
        struct termio tio;
@@ -152,7 +191,7 @@ long code, arg;
                if (!verbose(tcp) || umove(tcp, arg, &tios) < 0)
                        return 0;
                if (abbrev(tcp)) {
-                       tprintf(", {");
+                       tprints(", {");
                        printxval(baud_options, tios.c_cflag & CBAUD, "B???");
                        tprintf(" %sopost %sisig %sicanon %secho ...}",
                                (tios.c_oflag & OPOST) ? "" : "-",
@@ -165,9 +204,7 @@ long code, arg;
                        (long) tios.c_iflag, (long) tios.c_oflag);
                tprintf("c_cflags=%#lx, c_lflags=%#lx, ",
                        (long) tios.c_cflag, (long) tios.c_lflag);
-#ifndef SVR4
                tprintf("c_line=%u, ", tios.c_line);
-#endif
                if (!(tios.c_lflag & ICANON))
                        tprintf("c_cc[VMIN]=%d, c_cc[VTIME]=%d, ",
                                tios.c_cc[VMIN], tios.c_cc[VTIME]);
@@ -188,7 +225,7 @@ long code, arg;
                if (!verbose(tcp) || umove(tcp, arg, &tio) < 0)
                        return 0;
                if (abbrev(tcp)) {
-                       tprintf(", {");
+                       tprints(", {");
                        printxval(baud_options, tio.c_cflag & CBAUD, "B???");
                        tprintf(" %sopost %sisig %sicanon %secho ...}",
                                (tio.c_oflag & OPOST) ? "" : "-",
@@ -245,15 +282,23 @@ long code, arg;
 #endif
 
        /* ioctls with a direct decodable arg */
-
+#ifdef TCXONC
        case TCXONC:
-               tprintf(", ");
+               tprints(", ");
                printxval(tcxonc_options, arg, "TC???");
                return 1;
+#endif
+#ifdef TCLFLSH
        case TCFLSH:
-               tprintf(", ");
+               tprints(", ");
                printxval(tcflsh_options, arg, "TC???");
                return 1;
+#endif
+#ifdef TIOCSCTTY
+       case TIOCSCTTY:
+               tprintf(", %ld", arg);
+               return 1;
+#endif
 
        /* ioctls with an indirect parameter displayed as modem flags */
 
@@ -262,12 +307,11 @@ long code, arg;
        case TIOCMBIS:
        case TIOCMBIC:
        case TIOCMSET:
-               if (umove(tcp, arg, &arg) < 0)
+               if (umove(tcp, arg, &i) < 0)
                        return 0;
-               tprintf(", [");
-               if (!printflags(modem_flags, arg))
-                       tprintf("0");
-               tprintf("]");
+               tprints(", [");
+               printflags(modem_flags, i, "TIOCM_???");
+               tprints("]");
                return 1;
 #endif /* TIOCMGET */
 
@@ -339,32 +383,21 @@ long code, arg;
 #ifdef TIOCGPTN
        case TIOCGPTN:
 #endif
-               tprintf(", ");
-               printnum(tcp, arg, "%d");
+               tprints(", ");
+               printnum_int(tcp, arg, "%d");
                return 1;
 
-#if 0
-       /* ioctls with an indirect parameter displayed in hex */
-
-               tprintf(", ");
-               printnum(tcp, arg, "%#x");
-               return 1;
-#endif
-
        /* ioctls with an indirect parameter displayed as a char */
 
 #ifdef TIOCSTI
        case TIOCSTI:
 #endif
-               tprintf(", ");
+               tprints(", ");
                printstr(tcp, arg, 1);
                return 1;
 
        /* ioctls with no parameters */
 
-#ifdef TIOCSCTTY
-       case TIOCSCTTY:
-#endif
 #ifdef TIOCNOTTY
        case TIOCNOTTY:
 #endif
@@ -385,4 +418,3 @@ long code, arg;
                return 0;
        }
 }
-