From 434bf5fadd1bc7e7c4af0eb402457365860ec760 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 31 Jan 2007 12:55:39 +0000 Subject: r21080: Reformatting (This used to be commit 705f866a78ec3f1169543bf82fb48ea6580160a9) --- source3/smbd/reply.c | 105 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 37 deletions(-) (limited to 'source3/smbd/reply.c') diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index b0bddc03f6..37c8a46ed3 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -4116,7 +4116,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, pstrin code. ****************************************************************************/ -NTSTATUS rename_internals(connection_struct *conn, pstring name, pstring newname, uint32 attrs, BOOL replace_if_exists, BOOL has_wild) +NTSTATUS rename_internals(connection_struct *conn, pstring name, + pstring newname, uint32 attrs, + BOOL replace_if_exists, BOOL has_wild) { pstring directory; pstring mask; @@ -4133,12 +4135,14 @@ NTSTATUS rename_internals(connection_struct *conn, pstring name, pstring newname ZERO_STRUCT(sbuf1); ZERO_STRUCT(sbuf2); - status = unix_convert(conn, name, has_wild, last_component_src, &sbuf1); + status = unix_convert(conn, name, has_wild, last_component_src, + &sbuf1); if (!NT_STATUS_IS_OK(status)) { return status; } - status = unix_convert(conn, newname, True, last_component_dest, &sbuf2); + status = unix_convert(conn, newname, True, last_component_dest, + &sbuf2); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -4194,10 +4198,13 @@ NTSTATUS rename_internals(connection_struct *conn, pstring name, pstring newname pstrcpy(newname, tmpstr); } - DEBUG(3,("rename_internals: case_sensitive = %d, case_preserve = %d, short case preserve = %d, \ -directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", - conn->case_sensitive, conn->case_preserve, conn->short_case_preserve, directory, - newname, last_component_dest, is_short_name)); + DEBUG(3, ("rename_internals: case_sensitive = %d, " + "case_preserve = %d, short case preserve = %d, " + "directory = %s, newname = %s, " + "last_component_dest = %s, is_8_3 = %d\n", + conn->case_sensitive, conn->case_preserve, + conn->short_case_preserve, directory, + newname, last_component_dest, is_short_name)); /* * Check for special case with case preserving and not @@ -4240,13 +4247,16 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", */ if (!vfs_object_exist(conn, directory, &sbuf1)) { - DEBUG(3,("rename_internals: source doesn't exist doing rename %s -> %s\n", + DEBUG(3, ("rename_internals: source doesn't exist " + "doing rename %s -> %s\n", directory,newname)); - if (errno == ENOTDIR || errno == EISDIR || errno == ENOENT) { + if (errno == ENOTDIR || errno == EISDIR + || errno == ENOENT) { /* - * Must return different errors depending on whether the parent - * directory existed or not. + * Must return different errors depending on + * whether the parent directory existed or + * not. */ p = strrchr_m(directory, '/'); @@ -4258,8 +4268,9 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", return NT_STATUS_OBJECT_PATH_NOT_FOUND; } status = map_nt_error_from_unix(errno); - DEBUG(3,("rename_internals: Error %s rename %s -> %s\n", - nt_errstr(status), directory,newname)); + DEBUG(3, ("rename_internals: Error %s rename %s -> " + "%s\n", nt_errstr(status), directory, + newname)); return status; } @@ -4267,8 +4278,9 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", status = can_rename(conn,directory,attrs,&sbuf1); if (!NT_STATUS_IS_OK(status)) { - DEBUG(3,("rename_internals: Error %s rename %s -> %s\n", - nt_errstr(status), directory,newname)); + DEBUG(3,("rename_internals: Error %s rename %s -> " + "%s\n", nt_errstr(status), directory, + newname)); return status; } @@ -4278,14 +4290,17 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", */ if (strcsequal(directory, newname)) { - rename_open_files(conn, NULL, sbuf1.st_dev, sbuf1.st_ino, newname); - DEBUG(3,("rename_internals: identical names in rename %s - returning success\n", directory)); + rename_open_files(conn, NULL, sbuf1.st_dev, + sbuf1.st_ino, newname); + DEBUG(3, ("rename_internals: identical names in " + "rename %s - returning success\n", + directory)); return NT_STATUS_OK; } if(!replace_if_exists && vfs_object_exist(conn,newname,NULL)) { - DEBUG(3,("rename_internals: dest exists doing rename %s -> %s\n", - directory,newname)); + DEBUG(3,("rename_internals: dest exists doing " + "rename %s -> %s\n", directory, newname)); return NT_STATUS_OBJECT_NAME_COLLISION; } @@ -4293,12 +4308,14 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", return NT_STATUS_SHARING_VIOLATION; } - lck = get_share_mode_lock(NULL, sbuf1.st_dev, sbuf1.st_ino, NULL, NULL); + lck = get_share_mode_lock(NULL, sbuf1.st_dev, sbuf1.st_ino, + NULL, NULL); if(SMB_VFS_RENAME(conn,directory, newname) == 0) { - DEBUG(3,("rename_internals: succeeded doing rename on %s -> %s\n", - directory,newname)); - rename_open_files(conn, lck, sbuf1.st_dev, sbuf1.st_ino, newname); + DEBUG(3,("rename_internals: succeeded doing rename " + "on %s -> %s\n", directory, newname)); + rename_open_files(conn, lck, sbuf1.st_dev, + sbuf1.st_ino, newname); TALLOC_FREE(lck); return NT_STATUS_OK; } @@ -4337,7 +4354,10 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", } status = NT_STATUS_NO_SUCH_FILE; -/* Was status = NT_STATUS_OBJECT_NAME_NOT_FOUND; - gentest fix. JRA */ + /* + * Was status = NT_STATUS_OBJECT_NAME_NOT_FOUND; + * - gentest fix. JRA + */ while ((dname = ReadDirName(dir_hnd, &offset))) { pstring fname; @@ -4347,7 +4367,8 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", /* Quick check for "." and ".." */ if (fname[0] == '.') { - if (!fname[1] || (fname[1] == '.' && !fname[2])) { + if (!fname[1] + || (fname[1] == '.' && !fname[2])) { if (attrs & aDIR) { sysdir_entry = True; } else { @@ -4356,7 +4377,8 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", } } - if (!is_visible_file(conn, directory, dname, &sbuf1, False)) { + if (!is_visible_file(conn, directory, dname, &sbuf1, + False)) { continue; } @@ -4370,34 +4392,40 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", } status = NT_STATUS_ACCESS_DENIED; - slprintf(fname,sizeof(fname)-1,"%s/%s",directory,dname); + slprintf(fname, sizeof(fname)-1, "%s/%s", directory, + dname); if (!vfs_object_exist(conn, fname, &sbuf1)) { status = NT_STATUS_OBJECT_NAME_NOT_FOUND; - DEBUG(6,("rename %s failed. Error %s\n", fname, nt_errstr(status))); + DEBUG(6, ("rename %s failed. Error %s\n", + fname, nt_errstr(status))); continue; } status = can_rename(conn,fname,attrs,&sbuf1); if (!NT_STATUS_IS_OK(status)) { - DEBUG(6,("rename %s refused\n", fname)); + DEBUG(6, ("rename %s refused\n", fname)); continue; } pstrcpy(destname,newname); if (!resolve_wildcards(fname,destname)) { - DEBUG(6,("resolve_wildcards %s %s failed\n", - fname, destname)); + DEBUG(6, ("resolve_wildcards %s %s failed\n", + fname, destname)); continue; } if (strcsequal(fname,destname)) { - rename_open_files(conn, NULL, sbuf1.st_dev, sbuf1.st_ino, newname); - DEBUG(3,("rename_internals: identical names in wildcard rename %s - success\n", fname)); + rename_open_files(conn, NULL, sbuf1.st_dev, + sbuf1.st_ino, newname); + DEBUG(3,("rename_internals: identical names " + "in wildcard rename %s - success\n", + fname)); count++; status = NT_STATUS_OK; continue; } - if (!replace_if_exists && vfs_file_exist(conn,destname, NULL)) { + if (!replace_if_exists + && vfs_file_exist(conn,destname, NULL)) { DEBUG(6,("file_exist %s\n", destname)); status = NT_STATUS_OBJECT_NAME_COLLISION; continue; @@ -4407,15 +4435,18 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", return NT_STATUS_SHARING_VIOLATION; } - lck = get_share_mode_lock(NULL, sbuf1.st_dev, sbuf1.st_ino, NULL, NULL); + lck = get_share_mode_lock(NULL, sbuf1.st_dev, + sbuf1.st_ino, NULL, NULL); if (!SMB_VFS_RENAME(conn,fname,destname)) { - rename_open_files(conn, lck, sbuf1.st_dev, sbuf1.st_ino, newname); + rename_open_files(conn, lck, sbuf1.st_dev, + sbuf1.st_ino, newname); count++; status = NT_STATUS_OK; } TALLOC_FREE(lck); - DEBUG(3,("rename_internals: doing rename on %s -> %s\n",fname,destname)); + DEBUG(3,("rename_internals: doing rename on %s -> " + "%s\n",fname,destname)); } CloseDir(dir_hnd); } -- cgit