| devname.c (1573) | devname.c (23658) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 18 unchanged lines hidden (view full) --- 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34#if defined(LIBC_SCCS) && !defined(lint) | 1/* 2 * Copyright (c) 1989, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 18 unchanged lines hidden (view full) --- 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 */ 33 34#if defined(LIBC_SCCS) && !defined(lint) |
| 35static char sccsid[] = "@(#)devname.c 8.1 (Berkeley) 6/4/93"; | 35static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95"; |
| 36#endif /* LIBC_SCCS and not lint */ 37 38#include <sys/types.h> 39 40#include <db.h> 41#include <err.h> 42#include <errno.h> 43#include <fcntl.h> --- 15 unchanged lines hidden (view full) --- 59 DBT data, key; 60 61 if (!db && !failure && 62 !(db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL))) { 63 warn("warning: %s", _PATH_DEVDB); 64 failure = 1; 65 } 66 if (failure) | 36#endif /* LIBC_SCCS and not lint */ 37 38#include <sys/types.h> 39 40#include <db.h> 41#include <err.h> 42#include <errno.h> 43#include <fcntl.h> --- 15 unchanged lines hidden (view full) --- 59 DBT data, key; 60 61 if (!db && !failure && 62 !(db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL))) { 63 warn("warning: %s", _PATH_DEVDB); 64 failure = 1; 65 } 66 if (failure) |
| 67 return ("??"); | 67 return (NULL); |
| 68 69 /* 70 * Keys are a mode_t followed by a dev_t. The former is the type of 71 * the file (mode & S_IFMT), the latter is the st_rdev field. Be 72 * sure to clear any padding that may be found in bkey. 73 */ 74 memset(&bkey, 0, sizeof(bkey)); 75 bkey.dev = dev; 76 bkey.type = type; 77 key.data = &bkey; 78 key.size = sizeof(bkey); | 68 69 /* 70 * Keys are a mode_t followed by a dev_t. The former is the type of 71 * the file (mode & S_IFMT), the latter is the st_rdev field. Be 72 * sure to clear any padding that may be found in bkey. 73 */ 74 memset(&bkey, 0, sizeof(bkey)); 75 bkey.dev = dev; 76 bkey.type = type; 77 key.data = &bkey; 78 key.size = sizeof(bkey); |
| 79 return ((db->get)(db, &key, &data, 0) ? "??" : (char *)data.data); | 79 return ((db->get)(db, &key, &data, 0) ? NULL : (char *)data.data); |
| 80} | 80} |