diff options
| author | ache <ache@FreeBSD.org> | 1994-10-22 03:51:36 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1994-10-22 03:51:36 +0000 |
| commit | b77a63e6530bbce31999372e9e67d1b8fd83bf6c (patch) | |
| tree | c2d5bb6b2cac0f7a66b7a3a9016f380c7036b5c5 /gnu/libexec | |
| parent | b93705917b26ce76f6fc8eddb51370ec0ba003f6 (diff) | |
| download | FreeBSD-src-b77a63e6530bbce31999372e9e67d1b8fd83bf6c.zip FreeBSD-src-b77a63e6530bbce31999372e9e67d1b8fd83bf6c.tar.gz | |
Allow '#' in address in rmail arguments
Obtained from: taylor-uucp list
Diffstat (limited to 'gnu/libexec')
| -rw-r--r-- | gnu/libexec/uucp/common_sources/uuconf.h | 4 | ||||
| -rw-r--r-- | gnu/libexec/uucp/libuuconf/cmdlin.c | 23 | ||||
| -rw-r--r-- | gnu/libexec/uucp/uuxqt/uuxqt.c | 6 |
3 files changed, 21 insertions, 12 deletions
diff --git a/gnu/libexec/uucp/common_sources/uuconf.h b/gnu/libexec/uucp/common_sources/uuconf.h index 1710568..cb6dbb6 100644 --- a/gnu/libexec/uucp/common_sources/uuconf.h +++ b/gnu/libexec/uucp/common_sources/uuconf.h @@ -1418,6 +1418,10 @@ struct uuconf_cmdtab /* If set, a backslash at the end of a line may be used to include the next physical line in the logical line. */ #define UUCONF_CMDTABFLAG_BACKSLASH (0x2) + +/* If set, the comment character (#) is treated as a normal character, + rather than as starting a comment. */ +#define UUCONF_CMDTABFLAG_NOCOMMENTS (0x4) #if UUCONF_ANSI_C diff --git a/gnu/libexec/uucp/libuuconf/cmdlin.c b/gnu/libexec/uucp/libuuconf/cmdlin.c index 6a7406f..736dd0c 100644 --- a/gnu/libexec/uucp/libuuconf/cmdlin.c +++ b/gnu/libexec/uucp/libuuconf/cmdlin.c @@ -26,7 +26,7 @@ #include "uucnfi.h" #if USE_RCS_ID -const char _uuconf_cmdlin_rcsid[] = "$Id: cmdlin.c,v 1.3 1994/01/30 21:14:29 ian Rel $"; +const char _uuconf_cmdlin_rcsid[] = "$Id: cmdlin.c,v 1.2 1994/05/07 18:12:04 ache Exp $"; #endif #include <errno.h> @@ -56,18 +56,21 @@ uuconf_cmd_line (pglobal, zline, qtab, pinfo, pfiunknown, iflags, pblock) char **pzargs; int iret; - /* Any # not preceeded by a backslash starts a comment. */ - z = zline; - while ((z = strchr (z, '#')) != NULL) + if ((iflags & UUCONF_CMDTABFLAG_NOCOMMENTS) == 0) { - if (z == zline || *(z - 1) != '\\') + /* Any # not preceeded by a backslash starts a comment. */ + z = zline; + while ((z = strchr (z, '#')) != NULL) { - *z = '\0'; - break; + if (z == zline || *(z - 1) != '\\') + { + *z = '\0'; + break; + } + /* Remove the backslash. */ + while ((*(z - 1) = *z) != '\0') + ++z; } - /* Remove the backslash. */ - while ((*(z - 1) = *z) != '\0') - ++z; } /* Parse the first CSTACK arguments by hand to avoid malloc. */ diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.c b/gnu/libexec/uucp/uuxqt/uuxqt.c index 4d23cf1..890aa43 100644 --- a/gnu/libexec/uucp/uuxqt/uuxqt.c +++ b/gnu/libexec/uucp/uuxqt/uuxqt.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.76 1994/01/30 20:59:40 ian Rel $"; +const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.2 1994/05/07 18:14:43 ache Exp $"; #endif #include <errno.h> @@ -742,7 +742,9 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed) iuuconf = uuconf_cmd_file (puuconf, e, asQcmds, (pointer) zbase, (uuconf_cmdtabfn) NULL, - UUCONF_CMDTABFLAG_CASE, (pointer) NULL); + (UUCONF_CMDTABFLAG_CASE + | UUCONF_CMDTABFLAG_NOCOMMENTS), + (pointer) NULL); (void) fclose (e); if (iuuconf != UUCONF_SUCCESS) |
