Module Name: src
Committed By: christos
Date: Sat Apr 7 00:36:55 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: readconf.c scp.c
Log Message:
fix unconst
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/scp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/readconf.c
diff -u src/crypto/external/bsd/openssh/dist/readconf.c:1.23 src/crypto/external/bsd/openssh/dist/readconf.c:1.24
--- src/crypto/external/bsd/openssh/dist/readconf.c:1.23 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/readconf.c Fri Apr 6 20:36:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: readconf.c,v 1.23 2018/04/06 18:59:00 christos Exp $ */
+/* $NetBSD: readconf.c,v 1.24 2018/04/07 00:36:55 christos Exp $ */
/* $OpenBSD: readconf.c,v 1.283 2018/02/23 15:58:37 markus Exp $ */
/*
* Author: Tatu Ylonen <[email protected]>
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: readconf.c,v 1.23 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: readconf.c,v 1.24 2018/04/07 00:36:55 christos Exp $");
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -2440,7 +2440,7 @@ parse_jump(const char *s, Options *o, in
int
parse_ssh_uri(const char *uri, char **userp, char **hostp, int *portp)
{
- char *path;
+ const char *path;
int r;
r = parse_uri("ssh", uri, userp, hostp, portp, &path);
Index: src/crypto/external/bsd/openssh/dist/scp.c
diff -u src/crypto/external/bsd/openssh/dist/scp.c:1.18 src/crypto/external/bsd/openssh/dist/scp.c:1.19
--- src/crypto/external/bsd/openssh/dist/scp.c:1.18 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/scp.c Fri Apr 6 20:36:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: scp.c,v 1.18 2018/04/06 18:59:00 christos Exp $ */
+/* $NetBSD: scp.c,v 1.19 2018/04/07 00:36:55 christos Exp $ */
/* $OpenBSD: scp.c,v 1.195 2018/02/10 06:15:12 djm Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
@@ -73,7 +73,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: scp.c,v 1.18 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: scp.c,v 1.19 2018/04/07 00:36:55 christos Exp $");
#include <sys/param.h> /* roundup MAX */
#include <sys/types.h>
@@ -600,7 +600,7 @@ do_times(int fd, int verb, const struct
static int
parse_scp_uri(const char *uri, char **userp, char **hostp, int *portp,
- char **pathp)
+ const char **pathp)
{
int r;
@@ -613,8 +613,10 @@ parse_scp_uri(const char *uri, char **us
void
toremote(int argc, char **argv)
{
- char *suser = NULL, *host = NULL, *src = NULL;
- char *bp, *tuser, *thost, *targ;
+ char *suser = NULL, *host = NULL;
+ const char *src = NULL;
+ char *bp, *tuser, *thost;
+ const char *targ;
int sport = -1, tport = -1;
arglist alist;
int i, r;
@@ -647,7 +649,7 @@ toremote(int argc, char **argv)
for (i = 0; i < argc - 1; i++) {
free(suser);
free(host);
- free(src);
+ free(__UNCONST(src));
r = parse_scp_uri(argv[i], &suser, &host, &sport, &src);
if (r == -1) {
fmprintf(stderr, "%s: invalid uri\n", argv[i]);
@@ -725,16 +727,17 @@ toremote(int argc, char **argv)
out:
free(tuser);
free(thost);
- free(targ);
+ free(__UNCONST(targ));
free(suser);
free(host);
- free(src);
+ free(__UNCONST(src));
}
static void
tolocal(int argc, char **argv)
{
- char *bp, *host = NULL, *src = NULL, *suser = NULL;
+ char *bp, *host = NULL, *suser = NULL;
+ const char *src = NULL;
arglist alist;
int i, r, sport = -1;
@@ -744,7 +747,7 @@ tolocal(int argc, char **argv)
for (i = 0; i < argc - 1; i++) {
free(suser);
free(host);
- free(src);
+ free(__UNCONST(src));
r = parse_scp_uri(argv[i], &suser, &host, &sport, &src);
if (r == -1) {
fmprintf(stderr, "%s: invalid uri\n", argv[i]);
@@ -786,7 +789,7 @@ tolocal(int argc, char **argv)
}
free(suser);
free(host);
- free(src);
+ free(__UNCONST(src));
}
void
