summaryrefslogtreecommitdiffstats
path: root/cpukit/libfs/src/dosfs/msdos_create.c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-17 08:34:41 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-17 08:34:41 +0000
commita5305f6b33159d425e6fc5beb6807a675f70ecc9 (patch)
treef55d224dfb3bd157f6e7422d66919df283207a07 /cpukit/libfs/src/dosfs/msdos_create.c
parent2004-04-17 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-a5305f6b33159d425e6fc5beb6807a675f70ecc9.tar.bz2
Remove stray white spaces.
Diffstat (limited to 'cpukit/libfs/src/dosfs/msdos_create.c')
-rw-r--r--cpukit/libfs/src/dosfs/msdos_create.c132
1 files changed, 66 insertions, 66 deletions
diff --git a/cpukit/libfs/src/dosfs/msdos_create.c b/cpukit/libfs/src/dosfs/msdos_create.c
index d87d2c5d7d..49cf56917d 100644
--- a/cpukit/libfs/src/dosfs/msdos_create.c
+++ b/cpukit/libfs/src/dosfs/msdos_create.c
@@ -29,10 +29,10 @@
#include "msdos.h"
/* msdos_creat_node --
- * Create a new node. If a new node is file, FAT 32 Bytes Directory
- * Entry Structure is initialized, free space is found in parent
- * directory and structure is written to the disk. In case of directory,
- * all above steps present and also new cluster is allocated for a
+ * Create a new node. If a new node is file, FAT 32 Bytes Directory
+ * Entry Structure is initialized, free space is found in parent
+ * directory and structure is written to the disk. In case of directory,
+ * all above steps present and also new cluster is allocated for a
* new directory and dot and dotdot nodes are created in alloceted cluster.
*
* PARAMETERS:
@@ -45,22 +45,22 @@
*
* RETURNS:
* RC_OK on success, or -1 if error occured (errno set appropriately).
- *
+ *
*/
-int
+int
msdos_creat_node(
rtems_filesystem_location_info_t *parent_loc,
msdos_node_type_t type,
char *name,
mode_t mode,
const fat_file_fd_t *link_fd
- )
+ )
{
int rc = RC_OK;
ssize_t ret = 0;
msdos_fs_info_t *fs_info = parent_loc->mt_entry->fs_info;
fat_file_fd_t *parent_fat_fd = parent_loc->node_access;
- fat_file_fd_t *fat_fd = NULL;
+ fat_file_fd_t *fat_fd = NULL;
time_t time_ret = 0;
uint16_t time_val = 0;
uint16_t date = 0;
@@ -70,16 +70,16 @@ msdos_creat_node(
unsigned char link_node [MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE];
uint32_t sec = 0;
uint32_t byte = 0;
-
+
memset(new_node, 0, MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE);
memset(dot_dotdot, 0, MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE * 2);
-
+
/* set up name */
strncpy(MSDOS_DIR_NAME(new_node), name, MSDOS_NAME_MAX);
/* fill reserved field */
*MSDOS_DIR_NT_RES(new_node) = MSDOS_RES_NT_VALUE;
-
+
/* set up last write date and time */
time_ret = time(NULL);
if ( time_ret == -1 )
@@ -88,7 +88,7 @@ msdos_creat_node(
msdos_date_unix2dos(time_ret, &time_val, &date);
*MSDOS_DIR_WRITE_TIME(new_node) = CT_LE_W(time_val);
*MSDOS_DIR_WRITE_DATE(new_node) = CT_LE_W(date);
-
+
/* initialize directory/file size */
*MSDOS_DIR_FILE_SIZE(new_node) = MSDOS_INIT_DIR_SIZE;
@@ -98,23 +98,23 @@ msdos_creat_node(
else if (type == MSDOS_HARD_LINK) {
/*
* when we establish a (temporary) hard link,
- * we must copy some information from the original
+ * we must copy some information from the original
* node to the newly created
- */
+ */
/*
* read the original directory entry
*/
- sec = fat_cluster_num_to_sector_num(parent_loc->mt_entry,
+ sec = fat_cluster_num_to_sector_num(parent_loc->mt_entry,
link_fd->info_cln);
sec += (link_fd->info_ofs >> fs_info->fat.vol.sec_log2);
byte = (link_fd->info_ofs & (fs_info->fat.vol.bps - 1));
-
- ret = _fat_block_read(parent_loc->mt_entry,
+
+ ret = _fat_block_read(parent_loc->mt_entry,
sec, byte, MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE,
link_node);
if (ret < 0) {
return -1;
- }
+ }
/*
* copy various attributes
*/
@@ -123,14 +123,14 @@ msdos_creat_node(
*MSDOS_DIR_CRT_TIME(new_node) =*MSDOS_DIR_CRT_TIME(link_node);
*MSDOS_DIR_CRT_DATE(new_node) =*MSDOS_DIR_CRT_DATE(link_node);
- /*
+ /*
* copy/set "file size", "first cluster"
*/
*MSDOS_DIR_FILE_SIZE(new_node) =*MSDOS_DIR_FILE_SIZE(link_node);
- *MSDOS_DIR_FIRST_CLUSTER_LOW(new_node) =
+ *MSDOS_DIR_FIRST_CLUSTER_LOW(new_node) =
*MSDOS_DIR_FIRST_CLUSTER_LOW(link_node);
- *MSDOS_DIR_FIRST_CLUSTER_HI(new_node) =
+ *MSDOS_DIR_FIRST_CLUSTER_HI(new_node) =
*MSDOS_DIR_FIRST_CLUSTER_HI(link_node);
/*
* set "archive bit" due to changes
@@ -145,16 +145,16 @@ msdos_creat_node(
*MSDOS_DIR_ATTR(new_node) |= MSDOS_ATTR_ARCHIVE;
}
- /*
- * find free space in the parent directory and write new initialized
+ /*
+ * find free space in the parent directory and write new initialized
* FAT 32 Bytes Directory Entry Structure to the disk
*/
rc = msdos_get_name_node(parent_loc, NULL, &aux, new_node);
if ( rc != RC_OK )
return rc;
-
- /*
- * if we create a new file we are done, if directory there are more steps
+
+ /*
+ * if we create a new file we are done, if directory there are more steps
* to do
*/
if (type == MSDOS_DIRECTORY)
@@ -164,7 +164,7 @@ msdos_creat_node(
if (rc != RC_OK)
goto err;
- /*
+ /*
* we opened fat-file for node we just created, so initialize fat-file
* descritor
*/
@@ -173,27 +173,27 @@ msdos_creat_node(
fat_fd->fat_file_size = 0;
fat_fd->fat_file_type = FAT_DIRECTORY;
fat_fd->size_limit = MSDOS_MAX_DIR_LENGHT;
-
- /*
- * dot and dotdot entries are identical to new node except the
- * names
+
+ /*
+ * dot and dotdot entries are identical to new node except the
+ * names
*/
- memcpy(DOT_NODE_P(dot_dotdot), new_node,
- MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE);
+ memcpy(DOT_NODE_P(dot_dotdot), new_node,
+ MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE);
memcpy(DOTDOT_NODE_P(dot_dotdot), new_node,
- MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE);
- memcpy(MSDOS_DIR_NAME(DOT_NODE_P(dot_dotdot)), MSDOS_DOT_NAME,
+ MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE);
+ memcpy(MSDOS_DIR_NAME(DOT_NODE_P(dot_dotdot)), MSDOS_DOT_NAME,
MSDOS_NAME_MAX);
- memcpy(MSDOS_DIR_NAME(DOTDOT_NODE_P(dot_dotdot)), MSDOS_DOTDOT_NAME,
+ memcpy(MSDOS_DIR_NAME(DOTDOT_NODE_P(dot_dotdot)), MSDOS_DOTDOT_NAME,
MSDOS_NAME_MAX);
-
+
/* set up cluster num for dotdot entry */
- /*
- * here we can ommit FAT32 condition because for all FAT types dirs
- * right under root dir should contain 0 in dotdot entry but for
+ /*
+ * here we can ommit FAT32 condition because for all FAT types dirs
+ * right under root dir should contain 0 in dotdot entry but for
* FAT12/16 parent_fat_fd->cluster_num always contains such value
- */
- if ((FAT_FD_OF_ROOT_DIR(parent_fat_fd)) &&
+ */
+ if ((FAT_FD_OF_ROOT_DIR(parent_fat_fd)) &&
(fs_info->fat.vol.type & FAT_FAT32))
{
*MSDOS_DIR_FIRST_CLUSTER_LOW(DOTDOT_NODE_P(dot_dotdot)) = 0x0000;
@@ -201,26 +201,26 @@ msdos_creat_node(
}
else
{
- *MSDOS_DIR_FIRST_CLUSTER_LOW(DOTDOT_NODE_P(dot_dotdot)) =
+ *MSDOS_DIR_FIRST_CLUSTER_LOW(DOTDOT_NODE_P(dot_dotdot)) =
CT_LE_W((uint16_t )((parent_fat_fd->cln) & 0x0000FFFF));
- *MSDOS_DIR_FIRST_CLUSTER_HI(DOTDOT_NODE_P(dot_dotdot)) =
+ *MSDOS_DIR_FIRST_CLUSTER_HI(DOTDOT_NODE_P(dot_dotdot)) =
CT_LE_W((uint16_t )(((parent_fat_fd->cln) & 0xFFFF0000)>>16));
- }
-
- /*
- * write dot and dotdot entries to new fat-file: currently fat-file
- * correspondes to a new node is zero length, so it will be extended
+ }
+
+ /*
+ * write dot and dotdot entries to new fat-file: currently fat-file
+ * correspondes to a new node is zero length, so it will be extended
* by one cluster and entries will be written
*/
- ret = fat_file_write(parent_loc->mt_entry, fat_fd, 0,
- MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE * 2,
+ ret = fat_file_write(parent_loc->mt_entry, fat_fd, 0,
+ MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE * 2,
dot_dotdot);
if (ret < 0)
{
rc = -1;
goto error;
}
-
+
/* increment fat-file size by cluster size */
fat_fd->fat_file_size += fs_info->fat.vol.bpc;
@@ -231,7 +231,7 @@ msdos_creat_node(
CT_LE_W((uint16_t )(((fat_fd->cln) & 0xFFFF0000) >> 16));
/* rewrite dot entry */
- ret = fat_file_write(parent_loc->mt_entry, fat_fd, 0,
+ ret = fat_file_write(parent_loc->mt_entry, fat_fd, 0,
MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE,
DOT_NODE_P(dot_dotdot));
if (ret < 0)
@@ -239,12 +239,12 @@ msdos_creat_node(
rc = -1;
goto error;
}
-
+
/* write first cluster num of a new directory to disk */
- rc = msdos_set_first_cluster_num(parent_loc->mt_entry, fat_fd);
+ rc = msdos_set_first_cluster_num(parent_loc->mt_entry, fat_fd);
if (rc != RC_OK)
- goto error;
-
+ goto error;
+
fat_file_close(parent_loc->mt_entry, fat_fd);
}
return RC_OK;
@@ -254,7 +254,7 @@ error:
err:
/* mark 32bytes structure on the disk as free */
- msdos_set_first_char4file_name(parent_loc->mt_entry, aux.cln, aux.ofs,
+ msdos_set_first_char4file_name(parent_loc->mt_entry, aux.cln, aux.ofs,
0xE5);
return rc;
}
@@ -264,13 +264,13 @@ err:
* MSDOS FAT FS does not support links, but this call is needed to
* allow "rename" operations. The current NEWLIB rename performs a link
* from the old to the new name and then deletes the old filename.
- *
+ *
* This pseudo-"link" operation will create a new directory entry,
* copy the file size and cluster information from the "old"
* to the "new" directory entry and then clear the file size and cluster
- * info from the "old" filename, leaving this file as
+ * info from the "old" filename, leaving this file as
* a valid, but empty entry.
- *
+ *
* When this "link" call is part of a "rename" sequence, the "old"
* entry will be deleted in a subsequent "rmnod" call
*
@@ -285,7 +285,7 @@ err:
* RETURNS:
* RC_OK on success, or -1 if error occured (errno set appropriately)
*/
-int
+int
msdos_file_link(rtems_filesystem_location_info_t *to_loc,
rtems_filesystem_location_info_t *par_loc,
const char *token
@@ -298,11 +298,11 @@ msdos_file_link(rtems_filesystem_location_info_t *to_loc,
char new_name[ MSDOS_NAME_MAX + 1 ];
int len;
- /*
- * check spelling and format new node name
- */
+ /*
+ * check spelling and format new node name
+ */
if (MSDOS_NAME != msdos_get_token(token, new_name, &len)) {
- set_errno_and_return_minus_one(ENAMETOOLONG);
+ set_errno_and_return_minus_one(ENAMETOOLONG);
}
/*
* verify, that the existing node can be linked to