summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-08-06 19:30:42 +0000
committerJeremy Allison <jra@samba.org>2003-08-06 19:30:42 +0000
commit17a713d1b9eb00e28036fe9028c09c202340504f (patch)
treeae4fd7206298a1804d51eabf453e230774501571 /source3
parent44e6c30f711fe227dad9e77aeb1c2b06d7ce5993 (diff)
downloadsamba-17a713d1b9eb00e28036fe9028c09c202340504f.tar.gz
samba-17a713d1b9eb00e28036fe9028c09c202340504f.tar.bz2
samba-17a713d1b9eb00e28036fe9028c09c202340504f.zip
Get rid of MAXPATHLEN, move to standard PATH_MAX.
Jeremy. (This used to be commit 455ed2d51d86f39ce0fa6e6abca31a5425d2ea17)
Diffstat (limited to 'source3')
-rw-r--r--source3/client/clitar.c4
-rw-r--r--source3/client/smbmnt.c4
-rw-r--r--source3/client/smbmount.c2
-rw-r--r--source3/include/includes.h4
4 files changed, 5 insertions, 9 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 5295de8010..15c6ea3076 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -1477,7 +1477,7 @@ accordingly.
static int read_inclusion_file(char *filename)
{
XFILE *inclusion = NULL;
- char buf[MAXPATHLEN + 1];
+ char buf[MAX_PATH + 1];
char *inclusion_buffer = NULL;
int inclusion_buffer_size = 0;
int inclusion_buffer_sofar = 0;
@@ -1487,7 +1487,7 @@ static int read_inclusion_file(char *filename)
int error = 0;
clipn = 0;
- buf[MAXPATHLEN] = '\0'; /* guarantee null-termination */
+ buf[MAX_PATH] = '\0'; /* guarantee null-termination */
if ((inclusion = x_fopen(filename, O_RDONLY, 0)) == NULL) {
/* XXX It would be better to include a reason for failure, but without
* autoconf, it's hard to use strerror, sys_errlist, etc.
diff --git a/source3/client/smbmnt.c b/source3/client/smbmnt.c
index ce406179cf..0e36231bac 100644
--- a/source3/client/smbmnt.c
+++ b/source3/client/smbmnt.c
@@ -94,9 +94,9 @@ parse_args(int argc, char *argv[], struct smb_mount_data *data, char **share)
static char *
fullpath(const char *p)
{
- char path[MAXPATHLEN];
+ char path[PATH_MAX+1];
- if (strlen(p) > MAXPATHLEN-1) {
+ if (strlen(p) > PATH_MAX) {
return NULL;
}
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index 343d4f2675..156130758b 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -428,7 +428,7 @@ static void send_fs_socket(char *the_service, char *mount_point, struct cli_stat
**/
static void init_mount(void)
{
- char mount_point[MAXPATHLEN+1];
+ char mount_point[PATH_MAX+1];
pstring tmp;
pstring svc2;
struct cli_state *c;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index eb7f73b9d3..09375c84d8 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -958,10 +958,6 @@ struct smb_ldap_privates;
#define SYNC_DNS 1
#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
-
#ifndef SEEK_SET
#define SEEK_SET 0
#endif