Ignore etags ugly TAGS output file.

[nmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 759a81f9754e839d060d23940ca45079f9cb66bc..b0beeb23a64889961f3ae6187b1d53e8ca1b7497 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -93,13 +93,18 @@ cpnumber(charstring_t dest, int num, unsigned int wid, char fill, size_t max) {
            charstring_push_back (rev, '?');
        } else if (num < 0  &&  wid > 0) {
            /* Shouldn't need the wid > 0 check, that's why the condition
            charstring_push_back (rev, '?');
        } else if (num < 0  &&  wid > 0) {
            /* Shouldn't need the wid > 0 check, that's why the condition

-               at the top checks wid < max-1 when num < 0. */
-           charstring_push_back (rev, '-');
+              at the top checks wid < max-1 when num < 0. */

            --wid;
            --wid;

+           if (fill == ' ') {
+               charstring_push_back (rev, '-');
+           }

        }
        while (wid-- > 0  &&  fill != 0) {
            charstring_push_back (rev, fill);
        }
        }
        while (wid-- > 0  &&  fill != 0) {
            charstring_push_back (rev, fill);
        }

+       if (num < 0  &&  fill == '0') {
+           charstring_push_back (rev, '-');
+       }

 
        {
            /* Output the string in reverse. */
 
        {
            /* Output the string in reverse. */


@@ -691,7 +696,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
            if (str) {
                    char *xp;
 
            if (str) {
                    char *xp;
 

-                   strncpy(buffer, str, sizeof(buffer));
+                   if (str != buffer)
+                       strncpy(buffer, str, sizeof(buffer));

                    buffer[sizeof(buffer)-1] = '\0';
                    str = buffer;
                    while (isspace((unsigned char) *str))
                    buffer[sizeof(buffer)-1] = '\0';
                    str = buffer;
                    while (isspace((unsigned char) *str))


@@ -740,6 +746,9 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
        case FT_LV_MINUS_L:
            value = fmt->f_value - value;
            break;
        case FT_LV_MINUS_L:
            value = fmt->f_value - value;
            break;

+       case FT_LV_MULTIPLY_L:
+           value *= fmt->f_value;
+           break;

        case FT_LV_DIVIDE_L:
            if (fmt->f_value)
                value = value / fmt->f_value;
        case FT_LV_DIVIDE_L:
            if (fmt->f_value)
                value = value / fmt->f_value;


@@ -881,7 +890,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                goto unfriendly;
            if ((str = mn->m_pers) == NULL) {
                if ((str = mn->m_note)) {
                goto unfriendly;
            if ((str = mn->m_pers) == NULL) {
                if ((str = mn->m_note)) {

-                   strncpy (buffer, str, sizeof(buffer));
+                   if (str != buffer)
+                       strncpy (buffer, str, sizeof(buffer));

                    buffer[sizeof(buffer)-1] = '\0';
                    str = buffer;
                    if (*str == '(')
                    buffer[sizeof(buffer)-1] = '\0';
                    str = buffer;
                    if (*str == '(')


@@ -925,7 +935,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                /* UNQUOTEs RFC-2822 quoted-string and quoted-pair */
        case FT_LS_UNQUOTE:
            if (str) {          
                /* UNQUOTEs RFC-2822 quoted-string and quoted-pair */
        case FT_LS_UNQUOTE:
            if (str) {          

-               strncpy(buffer, str, sizeof(buffer));
+               if (str != buffer)
+                   strncpy(buffer, str, sizeof(buffer));

                /* strncpy doesn't NUL-terminate if it fills the buffer */
                buffer[sizeof(buffer)-1] = '\0';
                unquote_string(buffer, buffer2);
                /* strncpy doesn't NUL-terminate if it fills the buffer */
                buffer[sizeof(buffer)-1] = '\0';
                unquote_string(buffer, buffer2);


@@ -1063,6 +1074,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 
        case FT_MYMBOX:
        case FT_GETMYMBOX:
 
        case FT_MYMBOX:
        case FT_GETMYMBOX:

+       case FT_GETMYADDR:

            /*
             * if there's no component, we say true.  Otherwise we
             * say "true" only if we can parse the address and it
            /*
             * if there's no component, we say true.  Otherwise we
             * say "true" only if we can parse the address and it


@@ -1076,18 +1088,28 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                comp->c_mn = mn;
                if (ismymbox(mn)) {
                    comp->c_flags |= CF_TRUE;
                comp->c_mn = mn;
                if (ismymbox(mn)) {
                    comp->c_flags |= CF_TRUE;

-                   /* Set str for use with FT_GETMYMBOX.  It will be
-                      run through FT_LS_ADDR, which will strip off
-                      any pers name. */
-                    str = mn->m_text;
+                   /* Set str for use with FT_GETMYMBOX.  With
+                      FT_GETMYADDR, comp->c_mn will be run through
+                      FT_LS_ADDR, which will strip off any pers
+                      name. */
+                   str = mn->m_text;

                } else {
                    comp->c_flags &= ~CF_TRUE;
                } else {
                    comp->c_flags &= ~CF_TRUE;

-                }
+               }

                while ((sp = getname(sp)))
                    if ((comp->c_flags & CF_TRUE) == 0 &&
                        (mn = getm (sp, NULL, 0, NULL, 0)))
                while ((sp = getname(sp)))
                    if ((comp->c_flags & CF_TRUE) == 0 &&
                        (mn = getm (sp, NULL, 0, NULL, 0)))

-                       if (ismymbox(mn))
+                       if (ismymbox(mn)) {

                            comp->c_flags |= CF_TRUE;
                            comp->c_flags |= CF_TRUE;

+                           /* Set str and comp->c_text for use with
+                              FT_GETMYMBOX.  With FT_GETMYADDR,
+                              comp->c_mn will be run through
+                              FT_LS_ADDR, which will strip off any
+                              pers name. */
+                           free (comp->c_text);
+                           comp->c_text = str = strdup (mn->m_text);
+                           comp->c_mn = mn;
+                       }

                comp->c_flags |= CF_PARSED;
            } else {
                while (getname(""))             /* XXX */
                comp->c_flags |= CF_PARSED;
            } else {
                while (getname(""))             /* XXX */


@@ -1096,11 +1118,11 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                    comp->c_flags |= CF_TRUE;
                else {
                    comp->c_flags &= ~CF_TRUE;
                    comp->c_flags |= CF_TRUE;
                else {
                    comp->c_flags &= ~CF_TRUE;

-                }
+               }

                comp->c_mn = &fmt_mnull;
            }
            if ((comp->c_flags & CF_TRUE) == 0  &&
                comp->c_mn = &fmt_mnull;
            }
            if ((comp->c_flags & CF_TRUE) == 0  &&

-               fmt->f_type == FT_GETMYMBOX) {
+               (fmt->f_type == FT_GETMYMBOX || fmt->f_type == FT_GETMYADDR)) {

                /* Fool FT_LS_ADDR into not producing an address. */
                comp->c_mn = &fmt_mnull; comp->c_text = NULL;
            }
                /* Fool FT_LS_ADDR into not producing an address. */
                comp->c_mn = &fmt_mnull; comp->c_text = NULL;
            }