mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-09-03 07:35:20 +00:00
Code Issues Releases Wiki Activity

postfix-3.6-20210422

Browse Source
This commit is contained in:
Wietse Venema
2021-04-22 00:00:00 -05:00
committed by Viktor Dukhovni
parent a5d90789f4
commit 3d123ac94a
34 changed files with 269 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
postfix/HISTORY
View File

@@ -25531,3 +25531,19 @@ Apologies for any names omitted.
Bugfix (bug introduced 20210102): panic in some postconf
commands due to duplicate initialization of compatibility
level comparison operators. File: global/compat_level.c.
Cleanup: stricter parsing of known_tcp_port settings. Files:
util/argv_split_at.c, util/argv.h, global/config_known_tcp_ports.c.
20210420
Documentation: typofixes by Paul Menzel. File: RELEASE_NOTES.
Documentation: numeric IP address examples. File: conf/master.cf.
Documentation: added "-Wl,-R,/path/to/directory" hints to
optional build instructions. Files: proto/DB_README.html,
proto/LDAP_README.html, proto/LMDB_README.html,
proto/MYSQL_README.html, proto/PGSQL_README.html,
proto/SASL_README.html, proto/SQLITE_README.html,
proto/TLS_README.html.

3
postfix/README_FILES/DB_README
View File

@@ -65,6 +65,9 @@ something like:
AUXLIBS="-L/usr/local/BerkeleyDB/lib -ldb"
% make
If your Berkeley DB shared library is in a directory that the RUN-TIME linker
does not know about, add a "-Wl,-R,/path/to/directory" option after "-ldb".
Solaris needs this:
% make makefiles CCARGS="-DHAS_DB -I/usr/local/BerkeleyDB/include" \

3
postfix/README_FILES/LDAP_README
View File

@@ -54,6 +54,9 @@ this in the top level of your Postfix source tree should work:
% make makefiles CCARGS="-I/usr/local/include -DHAS_LDAP" \
AUXLIBS_LDAP="-L/usr/local/lib -lldap -L/usr/local/lib -llber"
If your LDAP shared library is in a directory that the RUN-TIME linker does not
know about, add a "-Wl,-R,/path/to/directory" option after "-lldap".
Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_LDAP. With Postfix
3.0 and later, the old AUXLIBS variable still supports building a statically-
loaded LDAP database client, but only the new AUXLIBS_LDAP variable supports

3
postfix/README_FILES/LMDB_README
View File

@@ -31,6 +31,9 @@ support, use something like:
AUXLIBS_LMDB="-L/usr/local/lib -llmdb"
% make
If your LMDB shared library is in a directory that the RUN-TIME linker does not
know about, add a "-Wl,-R,/path/to/directory" option after "-llmdb".
Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_LMDB. With Postfix
3.0 and later, the old AUXLIBS variable still supports building a statically-
loaded LMDB database client, but only the new AUXLIBS_LMDB variable supports

3
postfix/README_FILES/MYSQL_README
View File

@@ -39,6 +39,9 @@ mysqlclient library (and libm) to AUXLIBS_MYSQL, for example:
'CCARGS=-DHAS_MYSQL -I/usr/local/mysql/include' \
'AUXLIBS_MYSQL=-L/usr/local/mysql/lib -lmysqlclient -lz -lm'
If your MySQL shared library is in a directory that the RUN-TIME linker does
not know about, add a "-Wl,-R,/path/to/directory" option after "-lmysqlclient".
Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_MYSQL. With Postfix
3.0 and later, the old AUXLIBS variable still supports building a statically-
loaded MySQL database client, but only the new AUXLIBS_MYSQL variable supports

3
postfix/README_FILES/PGSQL_README
View File

@@ -36,6 +36,9 @@ For example:
'CCARGS=-DHAS_PGSQL -I/usr/local/include/pgsql' \
'AUXLIBS_PGSQL=-L/usr/local/lib -lpq'
If your PostgreSQL shared library is in a directory that the RUN-TIME linker
does not know about, add a "-Wl,-R,/path/to/directory" option after "-lpq".
Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_PGSQL. With Postfix
3.0 and later, the old AUXLIBS variable still supports building a statically-
loaded PostgreSQL database client, but only the new AUXLIBS_PGSQL variable

4
postfix/README_FILES/SASL_README
View File

@@ -1344,6 +1344,10 @@ Cyrus SASL version 2.1.x
% mmaakkee mmaakkeeffiilleess CCCCAARRGGSS==""--DDUUSSEE__SSAASSLL__AAUUTTHH --DDUUSSEE__CCYYRRUUSS__SSAASSLL \\
--II//uussrr//llooccaall//iinncclluuddee//ssaassll"" AAUUXXLLIIBBSS==""--LL//uussrr//llooccaall//lliibb --llssaassll22""
If your Cyrus SASL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lsasl2".
Cyrus SASL version 1.5.x
% mmaakkee ttiiddyy # if you have left-over files from a previous build

3
postfix/README_FILES/SQLITE_README
View File

@@ -26,6 +26,9 @@ For example:
'CCARGS=-DHAS_SQLITE -I/usr/local/include' \
'AUXLIBS_SQLITE=-L/usr/local/lib -lsqlite3 -lpthread'
If your SQLite shared library is in a directory that the RUN-TIME linker does
not know about, add a "-Wl,-R,/path/to/directory" option after "-lsqlite3".
Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_SQLITE. With Postfix
3.0 and later, the old AUXLIBS variable still supports building a statically-
loaded SQLite database client, but only the new AUXLIBS_SQLITE variable

4
postfix/README_FILES/TLS_README
View File

@@ -2440,6 +2440,10 @@ aapppprroopprriiaattee..
% mmaakkee mmaakkeeffiilleess CCCCAARRGGSS==""--DDUUSSEE__TTLLSS --II//uussrr//llooccaall//iinncclluuddee"" \\
AAUUXXLLIIBBSS==""--LL//uussrr//llooccaall//lliibb --llssssll --llccrryyppttoo""
If your OpenSSL shared library is in a directory that the RUN-TIME linker
does not know about, add a "-Wl,-R,/path/to/directory" option after "-
lcrypto".
On Solaris, specify the -R option as shown below:
% mmaakkee ttiiddyy # if you have left-over files from a previous build

4
postfix/RELEASE_NOTES
View File

@@ -89,7 +89,7 @@ no" permanent in main.cf, for example:
To stop the reminder, configure the respectful_logging parameter to
"yes" or "no", or configure "compatibility_level = 3.6".
Major changes with snapshot 20220109
Major changes with snapshot 20210109
====================================
Starting with Postfix version 3.6, the "latest" compatibility level
@@ -218,7 +218,7 @@ Incompatible change with snapshot 20200705
==========================================
The minimum OpenSSL version is 1.1.1, which will reach the end
of life by 20203-09-11.
of life by 2023-09-11.
The default digest has changed from md5 to sha256 (Postfix 3.6 with
compatibility_level >= 3). With a lower compatibility_level setting,

2
postfix/WISHLIST
View File

@@ -1,5 +1,7 @@
Wish list:
Add verp=+= to the qmgr "from=" logging.
Make smtpd_relay_before_recipient_restrictions settable
in smtpd_checks tests.

4
postfix/conf/master.cf
View File

@@ -14,6 +14,8 @@ smtp inet n - n - - smtpd
#smtpd pass - - n - - smtpd
#dnsblog unix - - n - 0 dnsblog
#tlsproxy unix - - n - 0 tlsproxy
# Choose one: enable submission for loopback clients only, or for any client.
#127.0.0.1:submission inet n - n - - smtpd
#submission inet n - n - - smtpd
# -o syslog_name=postfix/submission
# -o smtpd_tls_security_level=encrypt
@@ -26,6 +28,8 @@ smtp inet n - n - - smtpd
# -o smtpd_recipient_restrictions=
# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING
# Choose one: enable smtps for loopback clients only, or for any client.
#127.0.0.1:smtps inet n - n - - smtpd
#smtps inet n - n - - smtpd
# -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes

4
postfix/html/DB_README.html
View File

@@ -100,6 +100,10 @@ source code, use something like: </p>
</pre>
</blockquote>
<p> If your Berkeley DB shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-ldb". </p>
<p> Solaris needs this: </p>
<blockquote>

4
postfix/html/LDAP_README.html
View File

@@ -96,6 +96,10 @@ your Postfix source tree should work: </p>
</pre>
</blockquote>
<p> If your LDAP shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lldap". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of <a href="LDAP_README.html">AUXLIBS_LDAP</a>.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded LDAP database client, but only the new

4
postfix/html/LMDB_README.html
View File

@@ -55,6 +55,10 @@ build Postfix with LMDB support, use something like: </p>
</pre>
</blockquote>
<p> If your LMDB shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-llmdb". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of <a href="LMDB_README.html">AUXLIBS_LMDB</a>.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded LMDB database client, but only the new

4
postfix/html/MYSQL_README.html
View File

@@ -62,6 +62,10 @@ make -f Makefile.init makefiles \
</pre>
</blockquote>
<p> If your MySQL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lmysqlclient". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of <a href="MYSQL_README.html">AUXLIBS_MYSQL</a>.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded MySQL database client, but only the new

4
postfix/html/PGSQL_README.html
View File

@@ -57,6 +57,10 @@ the location of the libpq library file. </p>
</pre>
</blockquote>
<p> If your PostgreSQL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lpq". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of <a href="PGSQL_README.html">AUXLIBS_PGSQL</a>.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded PostgreSQL database client, but only

4
postfix/html/SASL_README.html
View File

@@ -2127,6 +2127,10 @@ definitions: </p>
-I/usr/local/include/sasl" AUXLIBS="-L/usr/local/lib -lsasl2"</strong>
</pre>
<p> If your Cyrus SASL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lsasl2". </p>
</dd>
<dt>Cyrus SASL version 1.5.x</dt>

4
postfix/html/SQLITE_README.html
View File

@@ -48,6 +48,10 @@ make -f Makefile.init makefiles \
</pre>
</blockquote>
<p> If your SQLite shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lsqlite3". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of <a href="SQLITE_README.html">AUXLIBS_SQLITE</a>.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded SQLite database client, but only the new

4
postfix/html/TLS_README.html
View File

@@ -3182,6 +3182,10 @@ are in directory <tt>/usr/local/lib</tt>: </p>
</pre>
</blockquote>
<p> If your OpenSSL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lcrypto". </p>
<p> On Solaris, specify the <tt>-R</tt> option as shown below:
<blockquote>

4
postfix/proto/DB_README.html
View File

@@ -100,6 +100,10 @@ source code, use something like: </p>
</pre>
</blockquote>
<p> If your Berkeley DB shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-ldb". </p>
<p> Solaris needs this: </p>
<blockquote>

4
postfix/proto/LDAP_README.html
View File

@@ -96,6 +96,10 @@ your Postfix source tree should work: </p>
</pre>
</blockquote>
<p> If your LDAP shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lldap". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_LDAP.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded LDAP database client, but only the new

4
postfix/proto/LMDB_README.html
View File

@@ -55,6 +55,10 @@ build Postfix with LMDB support, use something like: </p>
</pre>
</blockquote>
<p> If your LMDB shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-llmdb". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_LMDB.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded LMDB database client, but only the new

4
postfix/proto/MYSQL_README.html
View File

@@ -62,6 +62,10 @@ make -f Makefile.init makefiles \
</pre>
</blockquote>
<p> If your MySQL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lmysqlclient". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_MYSQL.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded MySQL database client, but only the new

4
postfix/proto/PGSQL_README.html
View File

@@ -57,6 +57,10 @@ the location of the libpq library file. </p>
</pre>
</blockquote>
<p> If your PostgreSQL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lpq". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_PGSQL.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded PostgreSQL database client, but only

4
postfix/proto/SASL_README.html
View File

@@ -2127,6 +2127,10 @@ definitions: </p>
-I/usr/local/include/sasl" AUXLIBS="-L/usr/local/lib -lsasl2"</strong>
</pre>
<p> If your Cyrus SASL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lsasl2". </p>
</dd>
<dt>Cyrus SASL version 1.5.x</dt>

4
postfix/proto/SQLITE_README.html
View File

@@ -48,6 +48,10 @@ make -f Makefile.init makefiles \
</pre>
</blockquote>
<p> If your SQLite shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lsqlite3". </p>
<p> Postfix versions before 3.0 use AUXLIBS instead of AUXLIBS_SQLITE.
With Postfix 3.0 and later, the old AUXLIBS variable still supports
building a statically-loaded SQLite database client, but only the new

4
postfix/proto/TLS_README.html
View File

@@ -3182,6 +3182,10 @@ are in directory <tt>/usr/local/lib</tt>: </p>
</pre>
</blockquote>
<p> If your OpenSSL shared library is in a directory that the RUN-TIME
linker does not know about, add a "-Wl,-R,/path/to/directory" option after
"-lcrypto". </p>
<p> On Solaris, specify the <tt>-R</tt> option as shown below:
<blockquote>

9
postfix/src/global/config_known_tcp_ports.c
View File

@@ -77,7 +77,7 @@ void config_known_tcp_ports(const char *source, const char *settings)
for (cpp = associations->argv; *cpp != 0; cpp++) {
char *temp = concatenate(" ", *cpp, " ", (char *) 0);
association = argv_split(temp, "=");
association = argv_split_at(temp, '=');
myfree(temp);
if (association->argc == 0) {
@@ -156,6 +156,13 @@ static struct test_case test_cases[] = {
/* warning */ "",
/* export */ "lmtp=24 smtp=25 smtps=465 submissions=465"
},
{"equal-equal",
/* config */ "smtp = 25, smtps == submissions = 465, lmtp = 24",
/* warning */ "config_known_tcp_ports: warning: equal-equal: "
"in \" smtps == submissions = 465\": missing service name before "
"\"=\"\n",
/* export */ "lmtp=24 smtp=25 smtps=465 submissions=465"
},
{"port test 1",
/* config */ "smtps = submission =",
/* warning */ "config_known_tcp_ports: warning: port test 1: "

3
postfix/src/global/config_known_tcp_ports.ref
View File

@@ -1,7 +1,8 @@
config_known_tcp_ports: good: PASS
config_known_tcp_ports: equal-equal: PASS
config_known_tcp_ports: port test 1: PASS
config_known_tcp_ports: port test 2: PASS
config_known_tcp_ports: port test 3: PASS
config_known_tcp_ports: service name test 1: PASS
config_known_tcp_ports: service name test 2: PASS
config_known_tcp_ports: PASS=6 FAIL=0
config_known_tcp_ports: PASS=7 FAIL=0

2
postfix/src/global/mail_version.h
View File

@@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
#define MAIL_RELEASE_DATE "20210419"
#define MAIL_RELEASE_DATE "20210422"
#define MAIL_VERSION_NUMBER "3.6"
#ifdef SNAPSHOT

16
postfix/src/util/Makefile.in
View File

@@ -42,7 +42,7 @@ SRCS = alldig.c allprint.c argv.c argv_split.c attr_clnt.c attr_print0.c \
extpar.c dict_inline.c casefold.c dict_utf8.c strcasecmp_utf8.c \
split_qnameval.c argv_attr_print.c argv_attr_scan.c dict_file.c \
msg_logger.c logwriter.c unix_dgram_connect.c unix_dgram_listen.c \
byte_mask.c known_tcp_ports.c
byte_mask.c known_tcp_ports.c argv_split_at.c
OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \
attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \
attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \
@@ -86,7 +86,7 @@ OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \
extpar.o dict_inline.o casefold.o dict_utf8.o strcasecmp_utf8.o \
split_qnameval.o argv_attr_print.o argv_attr_scan.o dict_file.o \
msg_logger.o logwriter.o unix_dgram_connect.o unix_dgram_listen.o \
byte_mask.o known_tcp_ports.o
byte_mask.o known_tcp_ports.o argv_split_at.o
# MAP_OBJ is for maps that may be dynamically loaded with dynamicmaps.cf.
# When hard-linking these, makedefs sets NON_PLUGIN_MAP_OBJ=$(MAP_OBJ),
# otherwise it sets the PLUGIN_* macros.
@@ -1049,6 +1049,16 @@ argv_split.o: stringops.h
argv_split.o: sys_defs.h
argv_split.o: vbuf.h
argv_split.o: vstring.h
argv_split_at.o: argv.h
argv_split_at.o: argv_split_at.c
argv_split_at.o: check_arg.h
argv_split_at.o: msg.h
argv_split_at.o: mymalloc.h
argv_split_at.o: split_at.h
argv_split_at.o: stringops.h
argv_split_at.o: sys_defs.h
argv_split_at.o: vbuf.h
argv_split_at.o: vstring.h
argv_splitq.o: argv.h
argv_splitq.o: argv_splitq.c
argv_splitq.o: check_arg.h
@@ -1977,6 +1987,8 @@ load_file.o: vbuf.h
load_file.o: vstream.h
load_file.o: warn_stat.h
load_lib.o: load_lib.c
load_lib.o: load_lib.h
load_lib.o: msg.h
load_lib.o: sys_defs.h
logwriter.o: check_arg.h
logwriter.o: iostuff.h

4
postfix/src/util/argv.h
View File

@@ -39,6 +39,10 @@ extern ARGV *argv_splitq(const char *, const char *, const char *);
extern ARGV *argv_splitq_count(const char *, const char *, const char *, ssize_t);
extern ARGV *argv_splitq_append(ARGV *, const char *, const char *, const char *);
extern ARGV *argv_split_at(const char *, int);
extern ARGV *argv_split_at_count(const char *, int, ssize_t);
extern ARGV *argv_split_at_append(ARGV *, const char *, int);
#define ARGV_FAKE_BEGIN(fake_argv, arg) { \
ARGV fake_argv; \
char *__fake_argv_args__[2]; \

124
postfix/src/util/argv_split_at.c Normal file
View File

@@ -0,0 +1,124 @@
/*++
/* NAME
/* argv_split_at 3
/* SUMMARY
/* string array utilities
/* SYNOPSIS
/* #include <argv.h>
/*
/* ARGV *argv_split_at(string, sep)
/* const char *string;
/* int sep;
/*
/* ARGV *argv_split_at_count(string, sep, count)
/* const char *string;
/* int sep;
/* ssize_t count;
/*
/* ARGV *argv_split_at_append(argv, string, sep)
/* ARGV *argv;
/* const char *string;
/* int sep;
/* DESCRIPTION
/* argv_split_at() splits \fIstring\fR into fields using a
/* single separator specified in \fIsep\fR. The result is a
/* null-terminated string array.
/*
/* argv_split_at_count() is like argv_split_at() but stops
/* splitting input after at most \fIcount\fR -1 times and
/* leaves the remainder, if any, in the last array element.
/* It is an error to specify a count < 1.
/*
/* argv_split_at_append() performs the same operation as
/* argv_split_at(), but appends the result to an existing
/* string array.
/* SEE ALSO
/* split_at(), trivial string splitter.
/* DIAGNOSTICS
/* Fatal errors: memory allocation problem.
/* LICENSE
/* .ad
/* .fi
/* The Secure Mailer license must be distributed with this software.
/* AUTHOR(S)
/* Wietse Venema
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
/*
/* Wietse Venema
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*--*/
/* System libraries. */
#include <sys_defs.h>
#include <string.h>
/* Application-specific. */
#include <mymalloc.h>
#include <stringops.h>
#include <argv.h>
#include <msg.h>
#include <split_at.h>
/* argv_split_at - split string into field array */
ARGV *argv_split_at(const char *string, int sep)
{
ARGV *argvp = argv_alloc(1);
char *saved_string = mystrdup(string);
char *bp = saved_string;
char *arg;
while ((arg = split_at(bp, sep)) != 0) {
argv_add(argvp, bp, (char *) 0);
bp = arg;
}
argv_add(argvp, bp, (char *) 0);
argv_terminate(argvp);
myfree(saved_string);
return (argvp);
}
/* argv_split_at_count - split string into field array */
ARGV *argv_split_at_count(const char *string, int sep, ssize_t count)
{
ARGV *argvp = argv_alloc(1);
char *saved_string = mystrdup(string);
char *bp = saved_string;
char *arg;
if (count < 1)
msg_panic("argv_split_at_count: bad count: %ld", (long) count);
while (count-- > 1 && (arg = split_at(bp, sep)) != 0) {
argv_add(argvp, bp, (char *) 0);
bp = arg;
}
argv_add(argvp, bp, (char *) 0);
argv_terminate(argvp);
myfree(saved_string);
return (argvp);
}
/* argv_split_at_append - split string into field array, append to array */
ARGV *argv_split_at_append(ARGV *argvp, const char *string, int sep)
{
char *saved_string = mystrdup(string);
char *bp = saved_string;
char *arg;
while ((arg = split_at(bp, sep)) != 0) {
argv_add(argvp, bp, (char *) 0);
bp = arg;
}
argv_add(argvp, bp, (char *) 0);
argv_terminate(argvp);
myfree(saved_string);
return (argvp);
}