DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-18 08:06:32 +00:00
Code Issues Releases Wiki Activity

new: devfs删除文件夹

Browse Source
This commit is contained in:
fslongjin
2022-09-12 23:56:31 +08:00
parent d60f1a8f80
commit 9f2b080cda
24 changed files with 366 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
user/apps/shell/cmd.c
View File

@ -210,7 +210,7 @@ int shell_cmd_cd(int argc, char **argv)
new_path[current_dir_len] = '/';
strcat(new_path, argv[1] + dest_offset);
int x = chdir(new_path);
if (x == 0) // 成功切换目录
{
free(shell_current_path);
@ -257,12 +257,12 @@ int shell_cmd_ls(int argc, char **argv)
break;
int color = COLOR_WHITE;
if (buf->d_type & VFS_ATTR_DIR)
if (buf->d_type & VFS_IF_DIR)
color = COLOR_YELLOW;
else if (buf->d_type & VFS_ATTR_FILE)
else if (buf->d_type & VFS_IF_FILE)
color = COLOR_INDIGO;
else if(buf->d_type & VFS_ATTR_DEVICE)
color= COLOR_GREEN;
else if (buf->d_type & VFS_IF_DEVICE)
color = COLOR_GREEN;
char output_buf[256] = {0};
@ -405,7 +405,21 @@ int shell_cmd_mkdir(int argc, char **argv)
* @return int
*/
// todo:
int shell_cmd_rmdir(int argc, char **argv) {}
int shell_cmd_rmdir(int argc, char **argv)
{
const char *full_path = NULL;
int result_path_len = -1;
if (argv[1][0] == '/')
full_path = argv[1];
else
full_path = get_target_filepath(argv[1], &result_path_len);
int retval = rmdir(full_path);
printf("rmdir: path=%s, retval=%d", full_path, retval);
if (argv != NULL)
free(argv);
return retval;
}
/**
* @brief 执行新的程序的命令
@ -483,7 +497,7 @@ int shell_cmd_free(int argc, char **argv)
struct mstat_t mst = {0};
retval = mstat(&mst);
if(retval!=0)
if (retval != 0)
{
printf("Failed: retval=%d", retval);
goto done;
@ -491,15 +505,15 @@ int shell_cmd_free(int argc, char **argv)
printf("\ttotal\tused\tfree\tshared\tcache\tavailable\n");
printf("Mem:\t");
if(argc==1) // 按照kb显示
if (argc == 1) // 按照kb显示
{
printf("%ld\t%ld\t%ld\t%ld\t%ld\t%ld\t\n", mst.total>>10,mst.used>>10,mst.free>>10, mst.shared>>10, mst.cache_used>>10, mst.available>>10);
printf("%ld\t%ld\t%ld\t%ld\t%ld\t%ld\t\n", mst.total >> 10, mst.used >> 10, mst.free >> 10, mst.shared >> 10, mst.cache_used >> 10, mst.available >> 10);
}
else // 按照MB显示
else // 按照MB显示
{
printf("%ld\t%ld\t%ld\t%ld\t%ld\t%ld\t\n", mst.total>>20,mst.used>>20,mst.free>>20, mst.shared>>20, mst.cache_used>>20, mst.available>>20);
printf("%ld\t%ld\t%ld\t%ld\t%ld\t%ld\t\n", mst.total >> 20, mst.used >> 20, mst.free >> 20, mst.shared >> 20, mst.cache_used >> 20, mst.available >> 20);
}
done:;
if (argv != NULL)
free(argv);