Terminate last arg in proxy argv n popsbr.c:parse_proxy().

[nmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 08405da1e00158842740f67dda8f63814551315d..5732af910c73cd0ac39e113a805aeb4d64a06689 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -832,7 +832,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                    value = -1;
            break;
        case FT_LV_DST:
                    value = -1;
            break;
        case FT_LV_DST:

-           value = fmt->f_comp->c_tws->tw_flags & TW_DST;
+           value = fmt->f_comp->c_tws->tw_flags & TW_DST ? 1 : 0;

            break;
        case FT_LS_822DATE:
            str = dasctime (fmt->f_comp->c_tws , TW_ZONE);
            break;
        case FT_LS_822DATE:
            str = dasctime (fmt->f_comp->c_tws , TW_ZONE);


@@ -1062,6 +1062,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
            break;
 
        case FT_MYMBOX:
            break;
 
        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


@@ -1073,24 +1075,46 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
            if ((sp = comp->c_text) && (sp = getname(sp)) &&
                (mn = getm (sp, NULL, 0, NULL, 0))) {
                comp->c_mn = mn;
            if ((sp = comp->c_text) && (sp = getname(sp)) &&
                (mn = getm (sp, NULL, 0, NULL, 0))) {
                comp->c_mn = mn;

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

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

-               else
+                   /* 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;
                    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 */
                    ;
                if (comp->c_text == 0)
                    comp->c_flags |= CF_TRUE;
            } else {
                while (getname(""))             /* XXX */
                    ;
                if (comp->c_text == 0)
                    comp->c_flags |= CF_TRUE;

-               else
+               else {

                    comp->c_flags &= ~CF_TRUE;
                    comp->c_flags &= ~CF_TRUE;

+               }

                comp->c_mn = &fmt_mnull;
            }
                comp->c_mn = &fmt_mnull;
            }

+           if ((comp->c_flags & CF_TRUE) == 0  &&
+               (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;
+           }

            break;
        }
 
            break;
        }