diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-01-20 23:14:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-26 23:58:53 +1100 |
commit | 087266ec33c76fc8d54ac5a19efacf2f4a4ca076 (patch) | |
tree | 71f57bb41b61561ebaa13026d8dc5d04d9829b00 /sftp.c | |
parent | 57e783c8ba2c0797f93977e83b2a8644a03065d8 (diff) |
upstream commit
Reduce use of <sys/param.h> and transition to <limits.h>
throughout. ok djm markus
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.169 2015/01/14 13:54:13 djm Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -17,6 +17,7 @@ | |||
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | 19 | ||
20 | #include <sys/param.h> /* MIN MAX */ | ||
20 | #include <sys/types.h> | 21 | #include <sys/types.h> |
21 | #include <sys/ioctl.h> | 22 | #include <sys/ioctl.h> |
22 | #ifdef HAVE_SYS_STAT_H | 23 | #ifdef HAVE_SYS_STAT_H |
@@ -46,6 +47,7 @@ | |||
46 | #else | 47 | #else |
47 | typedef void EditLine; | 48 | typedef void EditLine; |
48 | #endif | 49 | #endif |
50 | #include <limits.h> | ||
49 | #include <signal.h> | 51 | #include <signal.h> |
50 | #include <stdlib.h> | 52 | #include <stdlib.h> |
51 | #include <stdio.h> | 53 | #include <stdio.h> |
@@ -1401,7 +1403,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, | |||
1401 | int cmdnum, i; | 1403 | int cmdnum, i; |
1402 | unsigned long n_arg = 0; | 1404 | unsigned long n_arg = 0; |
1403 | Attrib a, *aa; | 1405 | Attrib a, *aa; |
1404 | char path_buf[MAXPATHLEN]; | 1406 | char path_buf[PATH_MAX]; |
1405 | int err = 0; | 1407 | int err = 0; |
1406 | glob_t g; | 1408 | glob_t g; |
1407 | 1409 | ||