Changeset d5c1051 in mainline for uspace/app/bdsh/cmds
- Timestamp:
- 2017-12-20T22:25:34Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 39b54fe
- Parents:
- 8610c2c
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)
- Location:
- uspace/app/bdsh/cmds
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/bdsh/cmds/builtins/batch/batch.c
r8610c2c rd5c1051 85 85 } 86 86 87 int rc = 0;87 int rc = EOK; 88 88 FILE *batch = fopen(argv[1], "r"); 89 89 if (batch == NULL) { … … 104 104 if (cur == fusr.line) { 105 105 /* skip empty line */ 106 rc = 0;106 rc = EOK; 107 107 free(cur); 108 108 } else { -
uspace/app/bdsh/cmds/builtins/cd/cd.c
r8610c2c rd5c1051 85 85 int cmd_cd(char **argv, cliuser_t *usr) 86 86 { 87 int argc, rc = 0; 87 int argc; 88 int rc = EOK; 88 89 89 90 argc = cli_count_args(argv); -
uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
r8610c2c rd5c1051 94 94 95 95 int ret = 0; 96 int rc; 96 97 97 98 if (!create_parents) { 98 r et= vfs_link_path(path, KIND_DIRECTORY, NULL);99 if (r et!= EOK) {99 rc = vfs_link_path(path, KIND_DIRECTORY, NULL); 100 if (rc != EOK) { 100 101 cli_error(CL_EFAIL, "%s: could not create %s (%s)", 101 cmdname, path, str_error(r et));102 cmdname, path, str_error(rc)); 102 103 ret = 1; 103 104 } … … 135 136 path[prev_off] = 0; 136 137 137 r et= vfs_link_path(path, KIND_DIRECTORY, NULL);138 if (r et != EOK && ret!= EEXIST) {138 rc = vfs_link_path(path, KIND_DIRECTORY, NULL); 139 if (rc != EOK && rc != EEXIST) { 139 140 cli_error(CL_EFAIL, "%s: could not create %s (%s)", 140 cmdname, path, str_error(r et));141 cmdname, path, str_error(rc)); 141 142 ret = 1; 142 143 goto leave; … … 146 147 } 147 148 /* Create the final directory. */ 148 r et= vfs_link_path(path, KIND_DIRECTORY, NULL);149 if (r et!= EOK) {149 rc = vfs_link_path(path, KIND_DIRECTORY, NULL); 150 if (rc != EOK) { 150 151 cli_error(CL_EFAIL, "%s: could not create %s (%s)", 151 cmdname, path, str_error(r et));152 cmdname, path, str_error(rc)); 152 153 ret = 1; 153 154 } -
uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
r8610c2c rd5c1051 202 202 free(buffer); 203 203 204 if (vfs_put(fd) < 0)204 if (vfs_put(fd) != EOK) 205 205 goto error; 206 206 -
uspace/app/bdsh/cmds/modules/mount/mount.c
r8610c2c rd5c1051 132 132 const char *mopts = ""; 133 133 const char *dev = ""; 134 int rc, c, opt_ind; 134 int rc; 135 int c, opt_ind; 135 136 unsigned int instance = 0; 136 137 bool instance_set = false; -
uspace/app/bdsh/cmds/modules/rm/rm.c
r8610c2c rd5c1051 209 209 rc = vfs_unlink_path(path); 210 210 if (rc == EOK) 211 return EOK;211 return 0; 212 212 213 213 cli_error(CL_ENOTSUP, "Can not remove %s", path);
Note:
See TracChangeset
for help on using the changeset viewer.