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 b380cb3aa3f89a8bed330e2d086b68570362e56c..11464c40adf20f10b270db803dcb40d35d54af7d 100644 (file)
--- a/bsd/miscfs/devfs/devfs_tree.c
+++ b/bsd/miscfs/devfs/devfs_tree.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
  * 
- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -99,7 +96,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;
 
@@ -137,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;
-#endif HIDDEN_MOUNTPOINT
+#endif /* HIDDEN_MOUNTPOINT */
        devfs_ready = 1;
        return (0);
 }
@@ -287,7 +284,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'        *
@@ -338,6 +335,7 @@ dev_finddir(char * path,
                scan++;
 
            strncpy(component, start, scan - start);
+               component[ scan - start ] = '\0';
            if (*scan == '/')
                scan++;
 
@@ -670,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);
-#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;
                }
        }