Alter HasSuffixC()'s char * to be const.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 3bee075e038e6165f50593c1cb11a952154e60ef..291cb69c31d821ab009ec742fd02acc53a3b8402 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -54,7 +54,7 @@ static jmp_buf myctx;
 static int bell = 1;
 static int newline = 1;
 static int biff = 0;
 static int bell = 1;
 static int newline = 1;
 static int biff = 0;

-static int width = 0;
+static int width = -1;

 static char *form = NULL;
 static char *format = NULL;
 
 static char *form = NULL;
 static char *format = NULL;
 


@@ -82,23 +82,23 @@ main (int argc, char **argv)
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
 
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }

 
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {

-               case AMBIGSW: 
+               case AMBIGSW:

                    ambigsw (cp, switches);
                    done (1);
                    ambigsw (cp, switches);
                    done (1);

-               case UNKWNSW: 
+               case UNKWNSW:

                    vec[vecp++] = --cp;
                    continue;
 
                    vec[vecp++] = --cp;
                    continue;
 

-               case HELPSW: 
+               case HELPSW:

                    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
                    print_help (buf, switches, 1);
                    done (0);
                    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
                    print_help (buf, switches, 1);
                    done (0);


@@ -110,12 +110,12 @@ main (int argc, char **argv)
                    biff = 1;
                    continue;
 
                    biff = 1;
                    continue;
 

-               case FORMSW: 
+               case FORMSW:

                    if (!(form = *argp++) || *form == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    format = NULL;
                    continue;
                    if (!(form = *argp++) || *form == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    format = NULL;
                    continue;

-               case FMTSW: 
+               case FMTSW:

                    if (!(format = *argp++) || *format == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    form = NULL;
                    if (!(format = *argp++) || *format == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    form = NULL;


@@ -198,7 +198,8 @@ message_fd (char **vec)
        /* fork error */
        close (fd);
        return header_fd ();
        /* fork error */
        close (fd);
        return header_fd ();

-    } else if (child_id) {
+    }
+    if (child_id) {

        /* parent process */
        if (!setjmp (myctx)) {
            SIGNAL (SIGALRM, alrmser);
        /* parent process */
        if (!setjmp (myctx)) {
            SIGNAL (SIGALRM, alrmser);


@@ -251,6 +252,7 @@ header_fd (void)
     int fd;
     char *nfs;
     char *tfile = NULL;
     int fd;
     char *nfs;
     char *tfile = NULL;

+    charstring_t scanl = NULL;

 
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
        advise(NULL, "unable to create temporary file in %s", get_temp_dir());
 
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
        advise(NULL, "unable to create temporary file in %s", get_temp_dir());


@@ -262,13 +264,22 @@ header_fd (void)
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);

-    scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
+    scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0, &scanl);

     scan_finished ();
     scan_finished ();

-    if (newline)
-        write (fd, "\n\r", 2);
-    write (fd, scanl, strlen (scanl));
-    if (bell)
-        write (fd, "\007", 1);
+    if (newline) {
+       if (write (fd, "\n\r", 2) < 0) {
+           advise (tfile, "write LF/CR");
+       }
+    }
+    if (write (fd, charstring_buffer (scanl), charstring_bytes (scanl)) < 0) {
+       advise (tfile, "write");
+    }
+    charstring_free (scanl);
+    if (bell) {
+        if (write (fd, "\007", 1) < 0) {
+           advise (tfile, "write BEL");
+        }
+    }

 
     return fd;
 }
 
     return fd;
 }