X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..4a2492630c73add3c3aa8a805ba4ff343d4a58ea:/bsd/miscfs/devfs/devfs_tree.c?ds=sidebyside diff --git a/bsd/miscfs/devfs/devfs_tree.c b/bsd/miscfs/devfs/devfs_tree.c index 60e1c0978..082fa947e 100644 --- a/bsd/miscfs/devfs/devfs_tree.c +++ b/bsd/miscfs/devfs/devfs_tree.c @@ -3,19 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * The contents of this file constitute Original Code as defined in and - * are subject to the Apple Public Source License Version 1.1 (the - * "License"). You may not use this file except in compliance with the - * License. Please obtain a copy of the License at - * http://www.apple.com/publicsource and read it before using this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. * - * This Original Code and all software distributed under the License are - * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. + * + * The Original Code and all software distributed under the License are + * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License. + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ @@ -96,7 +99,7 @@ struct devfs_stats devfs_stats; /* hold stats */ #ifdef HIDDEN_MOUNTPOINT static struct mount *devfs_hidden_mount; -#endif HIDDEN_MOINTPOINT +#endif /* HIDDEN_MOINTPOINT */ static int devfs_ready = 0; @@ -134,7 +137,7 @@ devfs_sinit(void) devfs_mount(devfs_hidden_mount,"dummy",NULL,NULL,NULL); dev_root->de_dnp->dn_dvm = (struct devfsmount *)devfs_hidden_mount->mnt_data; -#endif HIDDEN_MOUNTPOINT +#endif /* HIDDEN_MOUNTPOINT */ devfs_ready = 1; return (0); } @@ -284,7 +287,7 @@ dev_finddir(char * orig_path, /* find this dir (err if not dir) */ return 0; } } -#endif 0 +#endif /***********************************************************************\ * Given a starting node (0 for root) and a pathname, return the node * * for the end item on the path. It MUST BE A DIRECTORY. If the 'CREATE' * @@ -335,6 +338,7 @@ dev_finddir(char * path, scan++; strncpy(component, start, scan - start); + component[ scan - start ] = '\0'; if (*scan == '/') scan++; @@ -667,14 +671,14 @@ devfs_dn_free(devnode_t * dnp) if (dnp->dn_vn == NULL) { #if 0 printf("devfs_dn_free: free'ing %x\n", (unsigned int)dnp); -#endif 0 +#endif devnode_free(dnp); /* no accesses/references */ } else { #if 0 printf("devfs_dn_free: marking %x for deletion\n", (unsigned int)dnp); -#endif 0 +#endif dnp->dn_delete = TRUE; } } @@ -745,6 +749,7 @@ devfs_remove(void *dirent_p) devnode_t * dnp = ((devdirent_t *)dirent_p)->de_dnp; devnode_t * dnp2; boolean_t funnel_state; + boolean_t lastlink; funnel_state = thread_funnel_set(kernel_flock, TRUE); @@ -765,8 +770,11 @@ devfs_remove(void *dirent_p) dnp->dn_nextsibling->dn_prevsiblingp = &(dnp->dn_nextsibling); dnp2->dn_nextsibling = dnp2; dnp2->dn_prevsiblingp = &(dnp2->dn_nextsibling); - while(dnp2->dn_linklist) { - dev_free_name(dnp2->dn_linklist); + if(dnp2->dn_linklist) { + do { + lastlink = (1 == dnp2->dn_links); + dev_free_name(dnp2->dn_linklist); + } while (!lastlink); } } @@ -775,8 +783,11 @@ devfs_remove(void *dirent_p) * If we are not running in SPLIT_DEVS mode, then * THIS is what gets rid of the propogated nodes. */ - while(dnp->dn_linklist) { - dev_free_name(dnp->dn_linklist); + if(dnp->dn_linklist) { + do { + lastlink = (1 == dnp->dn_links); + dev_free_name(dnp->dn_linklist); + } while (!lastlink); } DEVFS_UNLOCK(0); out: @@ -1051,8 +1062,6 @@ dev_add_entry(char *name, devnode_t * parent, int type, devnode_type_t * typeinf return error; } -#include - /* * Function: devfs_make_node * @@ -1077,7 +1086,6 @@ devfs_make_node(dev_t dev, int chrblk, uid_t uid, devnode_type_t typeinfo; char *name, *path, buf[256]; /* XXX */ - char * b_ptr = buf; boolean_t funnel_state; int i; va_list ap; @@ -1093,9 +1101,8 @@ devfs_make_node(dev_t dev, int chrblk, uid_t uid, goto out; va_start(ap, fmt); - prf(fmt, ap, TOSTR, (struct tty *)&b_ptr); + vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - *b_ptr = 0; name = NULL; @@ -1152,7 +1159,6 @@ devfs_make_link(void *original, char *fmt, ...) va_list ap; char *p, buf[256]; /* XXX */ - char * b_ptr = buf; int i; boolean_t funnel_state; @@ -1164,9 +1170,8 @@ devfs_make_link(void *original, char *fmt, ...) } va_start(ap, fmt); - prf(fmt, ap, TOSTR, (struct tty *)&b_ptr); + vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - *b_ptr = 0; p = NULL;