xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / miscfs / synthfs / synthfs_util.c

diff --git a/bsd/miscfs/synthfs/synthfs_util.c b/bsd/miscfs/synthfs/synthfs_util.c
index a712ff8791812d21a75bf572b2f86001d92690b2..37ec7cde4fa0eb752d667e655a9510ecdc8c9d34 100644 (file)
--- a/bsd/miscfs/synthfs/synthfs_util.c
+++ b/bsd/miscfs/synthfs/synthfs_util.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @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@
  */
@@ -194,27 +191,25 @@ int synthfs_move_rename_entry(struct vnode *source_vp, struct vnode *newparent_v
        struct synthfsnode *source_sp = VTOS(source_vp);
        struct synthfsnode *parent_sp = VTOS(newparent_vp);
        char *new_name_ptr;
-       int result;
-       
-       if (parent_sp == source_sp->s_parent) return 0;
+       int result = 0;
        
        /* Unlink the entry from its current place: */
        result = synthfs_remove_entry(source_vp);
-       if (result) return result;
+       if (result) goto err_exit;
 
        /* Change the name as necessary: */
-       FREE(source_sp->s_name, M_TEMP);
-       if (new_name == NULL) {
-               MALLOC(new_name_ptr, char *, 1, M_TEMP, M_WAITOK);
-               new_name_ptr[0] = 0;
-       } else {
-       MALLOC(new_name_ptr, char *, strlen(new_name) + 1, M_TEMP, M_WAITOK);
-       strcpy(new_name_ptr, new_name);
-    };
-    source_sp->s_name = new_name_ptr;
-
+       if (new_name) {
+               FREE(source_sp->s_name, M_TEMP);
+               MALLOC(new_name_ptr, char *, strlen(new_name) + 1, M_TEMP, M_WAITOK);
+               strcpy(new_name_ptr, new_name);
+               source_sp->s_name = new_name_ptr;
+       };
+       
        /* Insert the entry in its new home: */
-       return synthfs_insertnode(source_sp, parent_sp);
+       result = synthfs_insertnode(source_sp, parent_sp);
+
+err_exit:
+       return result;
 }
 
 
@@ -320,7 +315,7 @@ long synthfs_adddirentry(u_int32_t fileno, u_int8_t type, const char *name, stru
     long padtext = 0;
     unsigned short direntrylength;
 
-    namelength = ((name == NULL) ? 0 : strlen(name));
+    namelength = ((name == NULL) ? 0 : strlen(name) + 1);
     padding = (4 - (namelength & 3)) & 3;
     direntrylength = sizeof(struct synthfs_direntry_head) + namelength + padding;