aboutsummaryrefslogtreecommitdiff
path: root/jim-file.c
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2011-11-06 23:21:48 +1000
committerSteve Bennett <steveb@workware.net.au>2011-11-07 15:31:29 +1000
commit5fe0bb5f3beedb262512a8e548bf7cc6ed9bff96 (patch)
tree3b010fb2fc159e74b3f5eb14dc273179a159e36d /jim-file.c
parent5e7859e24d9534bf1e7e745bf1e2906afcf83633 (diff)
downloadjimtcl-5fe0bb5f3beedb262512a8e548bf7cc6ed9bff96.zip
jimtcl-5fe0bb5f3beedb262512a8e548bf7cc6ed9bff96.tar.gz
jimtcl-5fe0bb5f3beedb262512a8e548bf7cc6ed9bff96.tar.bz2
Remove use of designated initialisers
For better compatibility c89 compatibility. Also simplify jim-subcmd. Remove -usage and command descriptions. Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim-file.c')
-rw-r--r--jim-file.c302
1 files changed, 151 insertions, 151 deletions
diff --git a/jim-file.c b/jim-file.c
index 7b48368..0ea6999 100644
--- a/jim-file.c
+++ b/jim-file.c
@@ -687,189 +687,189 @@ static int file_cmd_stat(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
}
static const jim_subcmd_type file_command_table[] = {
- { .cmd = "atime",
- .args = "name",
- .function = file_cmd_atime,
- .minargs = 1,
- .maxargs = 1,
- .description = "Last access time"
+ { "atime",
+ "name",
+ file_cmd_atime,
+ 1,
+ 1,
+ /* Description: Last access time */
},
- { .cmd = "mtime",
- .args = "name ?time?",
- .function = file_cmd_mtime,
- .minargs = 1,
- .maxargs = 2,
- .description = "Get or set last modification time"
+ { "mtime",
+ "name ?time?",
+ file_cmd_mtime,
+ 1,
+ 2,
+ /* Description: Get or set last modification time */
},
- { .cmd = "copy",
- .args = "?-force? source dest",
- .function = file_cmd_copy,
- .minargs = 2,
- .maxargs = 3,
- .description = "Copy source file to destination file"
+ { "copy",
+ "?-force? source dest",
+ file_cmd_copy,
+ 2,
+ 3,
+ /* Description: Copy source file to destination file */
},
- { .cmd = "dirname",
- .args = "name",
- .function = file_cmd_dirname,
- .minargs = 1,
- .maxargs = 1,
- .description = "Directory part of the name"
+ { "dirname",
+ "name",
+ file_cmd_dirname,
+ 1,
+ 1,
+ /* Description: Directory part of the name */
},
- { .cmd = "rootname",
- .args = "name",
- .function = file_cmd_rootname,
- .minargs = 1,
- .maxargs = 1,
- .description = "Name without any extension"
+ { "rootname",
+ "name",
+ file_cmd_rootname,
+ 1,
+ 1,
+ /* Description: Name without any extension */
},
- { .cmd = "extension",
- .args = "name",
- .function = file_cmd_extension,
- .minargs = 1,
- .maxargs = 1,
- .description = "Last extension including the dot"
+ { "extension",
+ "name",
+ file_cmd_extension,
+ 1,
+ 1,
+ /* Description: Last extension including the dot */
},
- { .cmd = "tail",
- .args = "name",
- .function = file_cmd_tail,
- .minargs = 1,
- .maxargs = 1,
- .description = "Last component of the name"
+ { "tail",
+ "name",
+ file_cmd_tail,
+ 1,
+ 1,
+ /* Description: Last component of the name */
},
- { .cmd = "normalize",
- .args = "name",
- .function = file_cmd_normalize,
- .minargs = 1,
- .maxargs = 1,
- .description = "Normalized path of name"
+ { "normalize",
+ "name",
+ file_cmd_normalize,
+ 1,
+ 1,
+ /* Description: Normalized path of name */
},
- { .cmd = "join",
- .args = "name ?name ...?",
- .function = file_cmd_join,
- .minargs = 1,
- .maxargs = -1,
- .description = "Join multiple path components"
+ { "join",
+ "name ?name ...?",
+ file_cmd_join,
+ 1,
+ -1,
+ /* Description: Join multiple path components */
},
- { .cmd = "readable",
- .args = "name",
- .function = file_cmd_readable,
- .minargs = 1,
- .maxargs = 1,
- .description = "Is file readable"
+ { "readable",
+ "name",
+ file_cmd_readable,
+ 1,
+ 1,
+ /* Description: Is file readable */
},
- { .cmd = "writable",
- .args = "name",
- .function = file_cmd_writable,
- .minargs = 1,
- .maxargs = 1,
- .description = "Is file writable"
+ { "writable",
+ "name",
+ file_cmd_writable,
+ 1,
+ 1,
+ /* Description: Is file writable */
},
- { .cmd = "executable",
- .args = "name",
- .function = file_cmd_executable,
- .minargs = 1,
- .maxargs = 1,
- .description = "Is file executable"
+ { "executable",
+ "name",
+ file_cmd_executable,
+ 1,
+ 1,
+ /* Description: Is file executable */
},
- { .cmd = "exists",
- .args = "name",
- .function = file_cmd_exists,
- .minargs = 1,
- .maxargs = 1,
- .description = "Does file exist"
+ { "exists",
+ "name",
+ file_cmd_exists,
+ 1,
+ 1,
+ /* Description: Does file exist */
},
- { .cmd = "delete",
- .args = "?-force|--? name ...",
- .function = file_cmd_delete,
- .minargs = 1,
- .maxargs = -1,
- .description = "Deletes the files or directories (must be empty unless -force)"
+ { "delete",
+ "?-force|--? name ...",
+ file_cmd_delete,
+ 1,
+ -1,
+ /* Description: Deletes the files or directories (must be empty unless -force) */
},
- { .cmd = "mkdir",
- .args = "dir ...",
- .function = file_cmd_mkdir,
- .minargs = 1,
- .maxargs = -1,
- .description = "Creates the directories"
+ { "mkdir",
+ "dir ...",
+ file_cmd_mkdir,
+ 1,
+ -1,
+ /* Description: Creates the directories */
},
#ifdef HAVE_MKSTEMP
- { .cmd = "tempfile",
- .args = "?template?",
- .function = file_cmd_tempfile,
- .minargs = 0,
- .maxargs = 1,
- .description = "Creates a temporary filename"
+ { "tempfile",
+ "?template?",
+ file_cmd_tempfile,
+ 0,
+ 1,
+ /* Description: Creates a temporary filename */
},
#endif
- { .cmd = "rename",
- .args = "?-force? source dest",
- .function = file_cmd_rename,
- .minargs = 2,
- .maxargs = 3,
- .description = "Renames a file"
+ { "rename",
+ "?-force? source dest",
+ file_cmd_rename,
+ 2,
+ 3,
+ /* Description: Renames a file */
},
#if defined(HAVE_READLINK)
- { .cmd = "readlink",
- .args = "name",
- .function = file_cmd_readlink,
- .minargs = 1,
- .maxargs = 1,
- .description = "Value of the symbolic link"
+ { "readlink",
+ "name",
+ file_cmd_readlink,
+ 1,
+ 1,
+ /* Description: Value of the symbolic link */
},
#endif
- { .cmd = "size",
- .args = "name",
- .function = file_cmd_size,
- .minargs = 1,
- .maxargs = 1,
- .description = "Size of file"
+ { "size",
+ "name",
+ file_cmd_size,
+ 1,
+ 1,
+ /* Description: Size of file */
},
- { .cmd = "stat",
- .args = "name var",
- .function = file_cmd_stat,
- .minargs = 2,
- .maxargs = 2,
- .description = "Stores results of stat in var array"
+ { "stat",
+ "name var",
+ file_cmd_stat,
+ 2,
+ 2,
+ /* Description: Stores results of stat in var array */
},
- { .cmd = "lstat",
- .args = "name var",
- .function = file_cmd_lstat,
- .minargs = 2,
- .maxargs = 2,
- .description = "Stores results of lstat in var array"
+ { "lstat",
+ "name var",
+ file_cmd_lstat,
+ 2,
+ 2,
+ /* Description: Stores results of lstat in var array */
},
- { .cmd = "type",
- .args = "name",
- .function = file_cmd_type,
- .minargs = 1,
- .maxargs = 1,
- .description = "Returns type of the file"
+ { "type",
+ "name",
+ file_cmd_type,
+ 1,
+ 1,
+ /* Description: Returns type of the file */
},
#ifdef HAVE_GETEUID
- { .cmd = "owned",
- .args = "name",
- .function = file_cmd_owned,
- .minargs = 1,
- .maxargs = 1,
- .description = "Returns 1 if owned by the current owner"
+ { "owned",
+ "name",
+ file_cmd_owned,
+ 1,
+ 1,
+ /* Description: Returns 1 if owned by the current owner */
},
#endif
- { .cmd = "isdirectory",
- .args = "name",
- .function = file_cmd_isdirectory,
- .minargs = 1,
- .maxargs = 1,
- .description = "Returns 1 if name is a directory"
+ { "isdirectory",
+ "name",
+ file_cmd_isdirectory,
+ 1,
+ 1,
+ /* Description: Returns 1 if name is a directory */
},
- { .cmd = "isfile",
- .args = "name",
- .function = file_cmd_isfile,
- .minargs = 1,
- .maxargs = 1,
- .description = "Returns 1 if name is a file"
+ { "isfile",
+ "name",
+ file_cmd_isfile,
+ 1,
+ 1,
+ /* Description: Returns 1 if name is a file */
},
{
- .cmd = 0
+ NULL
}
};