diff options
| author | Alexander Eremin <a.eremin@nexenta.com> | 2015-09-22 00:48:58 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-09-22 14:01:25 -0400 |
| commit | bd93c05dbd9b8f1e8d2edf48c777bc881f927608 (patch) | |
| tree | 31b825856f43696cf1be7abe8fff0981db7cb1b4 /usr/src/lib/libpkg | |
| parent | b584d06cf5d63c0af8a641ca543c28986ec5cf81 (diff) | |
| download | illumos-gate-bd93c05dbd9b8f1e8d2edf48c777bc881f927608.tar.gz | |
6198 Let's EOL cachefs
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/lib/libpkg')
| -rw-r--r-- | usr/src/lib/libpkg/common/isdir.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/lib/libpkg/common/isdir.c b/usr/src/lib/libpkg/common/isdir.c index 55b59d5e67..4589b0a56b 100644 --- a/usr/src/lib/libpkg/common/isdir.c +++ b/usr/src/lib/libpkg/common/isdir.c @@ -22,6 +22,7 @@ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -345,10 +346,9 @@ _InitRemoteFstypes(void) if ((fp = fopen(REMOTE_FS_DBFILE, "r")) == NULL) { /* no remote type database: use predefined remote types */ remoteFstypes = (char **)realloc(remoteFstypes, - sizeof (char *) * (numRemoteFstypes+3)); + sizeof (char *) * (numRemoteFstypes+2)); remoteFstypes[numRemoteFstypes++] = "nfs"; /* +1 */ remoteFstypes[numRemoteFstypes++] = "autofs"; /* +2 */ - remoteFstypes[numRemoteFstypes++] = "cachefs"; /* +3 */ return; } @@ -365,7 +365,6 @@ _InitRemoteFstypes(void) * * nfs NFS Utilities * autofs AUTOFS Utilities - * cachefs CACHEFS Utilities */ while (fgets(line_buf, sizeof (line_buf), fp) != NULL) { @@ -375,13 +374,13 @@ _InitRemoteFstypes(void) if (format[0] == '\0') { /* create bounded format: %ns */ (void) snprintf(format, sizeof (format), - "%%%ds", sizeof (buf)-1); + "%%%ds", sizeof (buf)-1); } (void) sscanf(line_buf, format, buf); remoteFstypes = realloc(remoteFstypes, - sizeof (char *) * (numRemoteFstypes+1)); + sizeof (char *) * (numRemoteFstypes+1)); remoteFstypes[numRemoteFstypes++] = strdup(buf); } |