Merge pull request #165 from dang/push

Make a header for strl*()

Author: dang

src/clnt_perror.c

@@ -46,6 +46,8 @@
 #include <rpc/auth.h>
 #include <rpc/clnt.h>
 
+#include "strl.h"
+
 static char *auth_errmsg(enum auth_stat);
 
 /*

src/netnamer.c

@@ -48,6 +48,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "strl.h"
+
 static char *OPSYS = "unix";
 static char *NETID = "netid.byname";
 static char *NETIDFILE = "/etc/netid";

src/rpc_dplx_internal.h

@@ -84,14 +84,6 @@ struct rpc_dplx_rec {
 #define RPC_DPLX_LOCKED		0x00100000
 #define RPC_DPLX_UNLOCK		0x00200000
 
-#ifndef HAVE_STRLCAT
-extern size_t strlcat(char *, const char *, size_t);
-#endif
-
-#ifndef HAVE_STRLCPY
-extern size_t strlcpy(char *, const char *src, size_t);
-#endif
-
 /* in clnt_generic.c */
 enum xprt_stat clnt_req_process_reply(SVCXPRT *, struct svc_req *);
 int clnt_req_xid_cmpf(const struct opr_rbtree_node *lhs,

src/rpc_generic.c

@@ -63,6 +63,7 @@
 #include <assert.h>
 
 #include "rpc_com.h"
+#include "strl.h"
 
 void
 thr_keyfree(void *k)

src/rpcb_clnt.c

@@ -58,6 +58,7 @@
 #include <assert.h>
 
 #include "rpc_com.h"
+#include "strl.h"
 
 /* retry timeout default to the moon and back */
 static struct timespec to = { 3, 0 };

src/strl.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef STRL_H
+#define STRL_H
+
+#include "config.h"
+
+#ifndef HAVE_STRLCAT
+extern size_t strlcat(char *, const char *, size_t);
+#endif
+
+#ifndef HAVE_STRLCPY
+extern size_t strlcpy(char *, const char *src, size_t);
+#endif
+
+
+#endif /* STRL_H */

src/strlcpy.c

@@ -14,10 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef HAVE_STRLCPY
 
 #include "config.h"
+#ifndef HAVE_STRLCPY
 #include <sys/types.h>
+#include "strl.h"
 
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters