diff options
Diffstat (limited to 'usr/src/lib/nsswitch/files/common')
| -rw-r--r-- | usr/src/lib/nsswitch/files/common/files_common.c | 19 | ||||
| -rw-r--r-- | usr/src/lib/nsswitch/files/common/files_common.h | 15 | ||||
| -rw-r--r-- | usr/src/lib/nsswitch/files/common/getexecattr.c | 11 |
3 files changed, 20 insertions, 25 deletions
diff --git a/usr/src/lib/nsswitch/files/common/files_common.c b/usr/src/lib/nsswitch/files/common/files_common.c index 2a8c30bc43..bdf03a3ca9 100644 --- a/usr/src/lib/nsswitch/files/common/files_common.c +++ b/usr/src/lib/nsswitch/files/common/files_common.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 1995-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * Common code and structures used by name-service-switch "files" backends. @@ -54,11 +53,11 @@ _nss_files_setent(be, dummy) /* Backend isn't initialized properly? */ return (NSS_UNAVAIL); } - if ((be->f = __nsl_fopen(be->filename, "r")) == 0) { + if ((be->f = fopen(be->filename, "rF")) == 0) { return (NSS_UNAVAIL); } } else { - __nsl_rewind(be->f); + rewind(be->f); } return (NSS_SUCCESS); } @@ -70,7 +69,7 @@ _nss_files_endent(be, dummy) void *dummy; { if (be->f != 0) { - __nsl_fclose(be->f); + fclose(be->f); be->f = 0; } if (be->buf != 0) { @@ -93,7 +92,7 @@ _nss_files_endent(be, dummy) */ int _nss_files_read_line(f, buffer, buflen) - __NSL_FILE *f; + FILE *f; char *buffer; int buflen; { @@ -104,7 +103,7 @@ _nss_files_read_line(f, buffer, buflen) while (1) { linelen = 0; while (linelen < buflen - 1) { /* "- 1" saves room for \n\0 */ - switch (c = __nsl_getc_unlocked(f)) { + switch (c = getc_unlocked(f)) { case EOF: if (linelen == 0 || buffer[linelen - 1] == '\\') { @@ -131,7 +130,7 @@ _nss_files_read_line(f, buffer, buflen) /* Buffer overflow -- eat rest of line and loop again */ /* ===> Should syslog() */ do { - c = __nsl_getc_unlocked(f); + c = getc_unlocked(f); if (c == EOF) { return (-1); } diff --git a/usr/src/lib/nsswitch/files/common/files_common.h b/usr/src/lib/nsswitch/files/common/files_common.h index 06ba03b576..87980f8310 100644 --- a/usr/src/lib/nsswitch/files/common/files_common.h +++ b/usr/src/lib/nsswitch/files/common/files_common.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -39,8 +38,6 @@ #include <nss_dbdefs.h> #include <stdio.h> -#include "../../../libnsl/include/nsl_stdio_prv.h" - #ifdef __cplusplus extern "C" { #endif @@ -80,7 +77,7 @@ struct files_backend { files_backend_op_t *ops; int n_ops; const char *filename; - __NSL_FILE *f; + FILE *f; int minbuf; char *buf; files_hash_t *hashinfo; @@ -103,7 +100,7 @@ extern nss_backend_t *_nss_files_constr(files_backend_op_t *ops, const char *filename, int min_bufsize, files_hash_t *fhp); -extern nss_status_t _nss_files_destr (files_backend_ptr_t, void *dummy); +extern nss_status_t _nss_files_destr(files_backend_ptr_t, void *dummy); extern nss_status_t _nss_files_setent(files_backend_ptr_t, void *dummy); extern nss_status_t _nss_files_endent(files_backend_ptr_t, void *dummy); extern nss_status_t _nss_files_getent_rigid(files_backend_ptr_t, void *); @@ -123,10 +120,10 @@ extern nss_status_t _nss_files_XY_hash(files_backend_ptr_t be, files_hash_t *fhp, int hashop, files_XY_check_func check); -int _nss_files_read_line(__NSL_FILE *f, char *buffer, int buflen); +int _nss_files_read_line(FILE *f, char *buffer, int buflen); #else extern nss_backend_t *_nss_files_constr(); -extern nss_status_t _nss_files_destr (); +extern nss_status_t _nss_files_destr(); extern nss_status_t _nss_files_setent(); extern nss_status_t _nss_files_endent(); extern nss_status_t _nss_files_getent_rigid(); diff --git a/usr/src/lib/nsswitch/files/common/getexecattr.c b/usr/src/lib/nsswitch/files/common/getexecattr.c index 2c5f5b482d..502c0112b9 100644 --- a/usr/src/lib/nsswitch/files/common/getexecattr.c +++ b/usr/src/lib/nsswitch/files/common/getexecattr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -129,12 +128,12 @@ _exec_files_XY_all(files_backend_ptr_t be, (void) _nss_files_endent(be, 0); return (NSS_UNAVAIL); } - if ((be->f = __nsl_fopen(be->filename, "r")) == 0) { + if ((be->f = fopen(be->filename, "rF")) == 0) { (void) _nss_files_endent(be, 0); (void) rw_unlock(&exec_lock); return (NSS_UNAVAIL); } - exec_fd = __nsl_fileno(be->f); + exec_fd = fileno(be->f); if (f_buf != NULL) free(f_buf); if ((f_buf = malloc(f_size)) == NULL) { |