xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / miscfs / devfs / devfs_tree.c

diff --git a/bsd/miscfs/devfs/devfs_tree.c b/bsd/miscfs/devfs/devfs_tree.c
index 9707f8a9c154242322070bef3a1592e3e4a57a36..11464c40adf20f10b270db803dcb40d35d54af7d 100644 (file)
--- a/bsd/miscfs/devfs/devfs_tree.c
+++ b/bsd/miscfs/devfs/devfs_tree.c
@@ -96,7 +96,7 @@ struct devfs_stats    devfs_stats;            /* hold stats */
 
 #ifdef HIDDEN_MOUNTPOINT
 static struct mount *devfs_hidden_mount;
 
 #ifdef HIDDEN_MOUNTPOINT
 static struct mount *devfs_hidden_mount;

-#endif HIDDEN_MOINTPOINT
+#endif /* HIDDEN_MOINTPOINT */

 
 static int devfs_ready = 0;
 
 
 static int devfs_ready = 0;
 


@@ -134,7 +134,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;
        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);
 }
        devfs_ready = 1;
        return (0);
 }


@@ -284,7 +284,7 @@ dev_finddir(char * orig_path,       /* find this dir (err if not dir) */
                return 0;
        }
 }
                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'        *
 /***********************************************************************\
 * 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 +335,7 @@ dev_finddir(char * path,
                scan++;
 
            strncpy(component, start, scan - start);
                scan++;
 
            strncpy(component, start, scan - start);

+               component[ scan - start ] = '\0';

            if (*scan == '/')
                scan++;
 
            if (*scan == '/')
                scan++;
 


@@ -667,14 +668,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);
                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);
                    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;
                }
        }
                    dnp->dn_delete = TRUE;
                }
        }


@@ -745,6 +746,7 @@ devfs_remove(void *dirent_p)
        devnode_t * dnp = ((devdirent_t *)dirent_p)->de_dnp;
        devnode_t * dnp2;
        boolean_t   funnel_state;
        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);
 
 
        funnel_state = thread_funnel_set(kernel_flock, TRUE);
 


@@ -765,8 +767,11 @@ devfs_remove(void *dirent_p)
                dnp->dn_nextsibling->dn_prevsiblingp = &(dnp->dn_nextsibling);
                dnp2->dn_nextsibling = dnp2;
                dnp2->dn_prevsiblingp = &(dnp2->dn_nextsibling);
                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 +780,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.
         */
         * 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:
        }
        DEVFS_UNLOCK(0);
 out: