Rev 4587 | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4587 | Rev 4682 | ||
---|---|---|---|
1 | /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> |
1 | /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> |
2 | * All rights reserved. |
2 | * All rights reserved. |
3 | * |
3 | * |
4 | * Redistribution and use in source and binary forms, with or without |
4 | * Redistribution and use in source and binary forms, with or without |
5 | * modification, are permitted provided that the following conditions are met: |
5 | * modification, are permitted provided that the following conditions are met: |
6 | * |
6 | * |
7 | * Redistributions of source code must retain the above copyright notice, this |
7 | * Redistributions of source code must retain the above copyright notice, this |
8 | * list of conditions and the following disclaimer. |
8 | * list of conditions and the following disclaimer. |
9 | * |
9 | * |
10 | * Redistributions in binary form must reproduce the above copyright notice, |
10 | * Redistributions in binary form must reproduce the above copyright notice, |
11 | * this list of conditions and the following disclaimer in the documentation |
11 | * this list of conditions and the following disclaimer in the documentation |
12 | * and/or other materials provided with the distribution. |
12 | * and/or other materials provided with the distribution. |
13 | * |
13 | * |
14 | * Neither the name of the original program's authors nor the names of its |
14 | * Neither the name of the original program's authors nor the names of its |
15 | * contributors may be used to endorse or promote products derived from this |
15 | * contributors may be used to endorse or promote products derived from this |
16 | * software without specific prior written permission. |
16 | * software without specific prior written permission. |
17 | * |
17 | * |
18 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
18 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
19 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
20 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
21 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
22 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
22 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
23 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
24 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
25 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
25 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
26 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
26 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
27 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
27 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
28 | * POSSIBILITY OF SUCH DAMAGE. |
28 | * POSSIBILITY OF SUCH DAMAGE. |
29 | */ |
29 | */ |
30 | 30 | ||
31 | /* NOTE: |
31 | /* NOTE: |
32 | * This is a bit of an ugly hack, working around the absence of fstat / etc. |
32 | * This is a bit of an ugly hack, working around the absence of fstat / etc. |
33 | * As more stuff is completed and exposed in libc, this will improve */ |
33 | * As more stuff is completed and exposed in libc, this will improve */ |
34 | 34 | ||
35 | #include <stdio.h> |
35 | #include <stdio.h> |
36 | #include <stdlib.h> |
36 | #include <stdlib.h> |
37 | #include <unistd.h> |
37 | #include <unistd.h> |
38 | #include <dirent.h> |
38 | #include <dirent.h> |
39 | #include <fcntl.h> |
39 | #include <fcntl.h> |
40 | #include <sys/types.h> |
40 | #include <sys/types.h> |
41 | #include <sys/stat.h> |
41 | #include <sys/stat.h> |
42 | #include <string.h> |
42 | #include <string.h> |
43 | 43 | ||
44 | #include "errors.h" |
44 | #include "errors.h" |
45 | #include "config.h" |
45 | #include "config.h" |
46 | #include "util.h" |
46 | #include "util.h" |
47 | #include "entry.h" |
47 | #include "entry.h" |
48 | #include "ls.h" |
48 | #include "ls.h" |
49 | #include "cmds.h" |
49 | #include "cmds.h" |
50 | 50 | ||
51 | static char *cmdname = "ls"; |
51 | static char *cmdname = "ls"; |
52 | 52 | ||
53 | static void ls_scan_dir(const char *d, DIR *dirp) |
53 | static void ls_scan_dir(const char *d, DIR *dirp) |
54 | { |
54 | { |
55 | struct dirent *dp; |
55 | struct dirent *dp; |
56 | char *buff; |
56 | char *buff; |
57 | 57 | ||
58 | if (! dirp) |
58 | if (! dirp) |
59 | return; |
59 | return; |
60 | 60 | ||
61 | buff = (char *)malloc(PATH_MAX); |
61 | buff = (char *)malloc(PATH_MAX); |
62 | if (NULL == buff) { |
62 | if (NULL == buff) { |
63 | cli_error(CL_ENOMEM, "ls: failed to scan %s", d); |
63 | cli_error(CL_ENOMEM, "ls: failed to scan %s", d); |
64 | return; |
64 | return; |
65 | } |
65 | } |
66 | 66 | ||
67 | while ((dp = readdir(dirp))) { |
67 | while ((dp = readdir(dirp))) { |
68 | memset(buff, 0, sizeof(buff)); |
68 | memset(buff, 0, sizeof(buff)); |
69 | /* Don't worry if inserting a double slash, this will be fixed by |
69 | /* Don't worry if inserting a double slash, this will be fixed by |
70 | * absolutize() later with subsequent calls to open() or readdir() */ |
70 | * absolutize() later with subsequent calls to open() or readdir() */ |
71 | snprintf(buff, PATH_MAX - 1, "%s/%s", d, dp->d_name); |
71 | snprintf(buff, PATH_MAX - 1, "%s/%s", d, dp->d_name); |
72 | ls_print(dp->d_name, buff); |
72 | ls_print(dp->d_name, buff); |
73 | } |
73 | } |
74 | 74 | ||
75 | free(buff); |
75 | free(buff); |
76 | 76 | ||
77 | return; |
77 | return; |
78 | } |
78 | } |
79 | 79 | ||
80 | /* ls_print currently does nothing more than print the entry. |
80 | /* ls_print currently does nothing more than print the entry. |
81 | * in the future, we will likely pass the absolute path, and |
81 | * in the future, we will likely pass the absolute path, and |
82 | * some sort of ls_options structure that controls how each |
82 | * some sort of ls_options structure that controls how each |
83 | * entry is printed and what is printed about it. |
83 | * entry is printed and what is printed about it. |
84 | * |
84 | * |
85 | * Now we just print basic DOS style lists */ |
85 | * Now we just print basic DOS style lists */ |
86 | 86 | ||
87 | static void ls_print(const char *name, const char *pathname) |
87 | static void ls_print(const char *name, const char *pathname) |
88 | { |
88 | { |
89 | struct stat s; |
89 | struct stat s; |
90 | int rc; |
90 | int rc; |
91 | 91 | ||
92 | if (rc = stat(pathname, &s)) { |
92 | rc = stat(pathname, &s); |
- | 93 | if (rc != 0) { |
|
93 | /* Odd chance it was deleted from the time readdir() found it */ |
94 | /* Odd chance it was deleted from the time readdir() found it */ |
94 | printf("ls: skipping bogus node %s\n", pathname); |
95 | printf("ls: skipping bogus node %s\n", pathname); |
95 | printf("rc=%d\n", rc); |
96 | printf("rc=%d\n", rc); |
96 | return; |
97 | return; |
97 | } |
98 | } |
98 | 99 | ||
99 | if (s.is_file) |
100 | if (s.is_file) |
100 | printf("%-40s\t%llu\n", name, (long long) s.size); |
101 | printf("%-40s\t%llu\n", name, (long long) s.size); |
101 | else |
102 | else |
102 | printf("%-40s\n", name); |
103 | printf("%-40s\n", name); |
103 | 104 | ||
104 | return; |
105 | return; |
105 | } |
106 | } |
106 | 107 | ||
107 | void help_cmd_ls(unsigned int level) |
108 | void help_cmd_ls(unsigned int level) |
108 | { |
109 | { |
109 | if (level == HELP_SHORT) { |
110 | if (level == HELP_SHORT) { |
110 | printf("`%s' lists files and directories.\n", cmdname); |
111 | printf("`%s' lists files and directories.\n", cmdname); |
111 | } else { |
112 | } else { |
112 | help_cmd_ls(HELP_SHORT); |
113 | help_cmd_ls(HELP_SHORT); |
113 | printf(" `%s' [path], if no path is given the current " |
114 | printf(" `%s' [path], if no path is given the current " |
114 | "working directory is used.\n", cmdname); |
115 | "working directory is used.\n", cmdname); |
115 | } |
116 | } |
116 | 117 | ||
117 | return; |
118 | return; |
118 | } |
119 | } |
119 | 120 | ||
120 | int cmd_ls(char **argv) |
121 | int cmd_ls(char **argv) |
121 | { |
122 | { |
122 | unsigned int argc; |
123 | unsigned int argc; |
123 | struct stat s; |
124 | struct stat s; |
124 | char *buff; |
125 | char *buff; |
125 | DIR *dirp; |
126 | DIR *dirp; |
126 | 127 | ||
127 | argc = cli_count_args(argv); |
128 | argc = cli_count_args(argv); |
128 | 129 | ||
129 | buff = (char *) malloc(PATH_MAX); |
130 | buff = (char *) malloc(PATH_MAX); |
130 | if (NULL == buff) { |
131 | if (NULL == buff) { |
131 | cli_error(CL_ENOMEM, "%s: ", cmdname); |
132 | cli_error(CL_ENOMEM, "%s: ", cmdname); |
132 | return CMD_FAILURE; |
133 | return CMD_FAILURE; |
133 | } |
134 | } |
134 | memset(buff, 0, sizeof(buff)); |
135 | memset(buff, 0, sizeof(buff)); |
135 | 136 | ||
136 | if (argc == 1) |
137 | if (argc == 1) |
137 | getcwd(buff, PATH_MAX); |
138 | getcwd(buff, PATH_MAX); |
138 | else |
139 | else |
139 | str_cpy(buff, PATH_MAX, argv[1]); |
140 | str_cpy(buff, PATH_MAX, argv[1]); |
140 | 141 | ||
141 | if (stat(buff, &s)) { |
142 | if (stat(buff, &s)) { |
142 | cli_error(CL_ENOENT, buff); |
143 | cli_error(CL_ENOENT, buff); |
143 | free(buff); |
144 | free(buff); |
144 | return CMD_FAILURE; |
145 | return CMD_FAILURE; |
145 | } |
146 | } |
146 | 147 | ||
147 | if (s.is_file) { |
148 | if (s.is_file) { |
148 | ls_print(buff, buff); |
149 | ls_print(buff, buff); |
149 | } else { |
150 | } else { |
150 | dirp = opendir(buff); |
151 | dirp = opendir(buff); |
151 | if (!dirp) { |
152 | if (!dirp) { |
152 | /* May have been deleted between scoping it and opening it */ |
153 | /* May have been deleted between scoping it and opening it */ |
153 | cli_error(CL_EFAIL, "Could not stat %s", buff); |
154 | cli_error(CL_EFAIL, "Could not stat %s", buff); |
154 | free(buff); |
155 | free(buff); |
155 | return CMD_FAILURE; |
156 | return CMD_FAILURE; |
156 | } |
157 | } |
157 | ls_scan_dir(buff, dirp); |
158 | ls_scan_dir(buff, dirp); |
158 | closedir(dirp); |
159 | closedir(dirp); |
159 | } |
160 | } |
160 | 161 | ||
161 | free(buff); |
162 | free(buff); |
162 | 163 | ||
163 | return CMD_SUCCESS; |
164 | return CMD_SUCCESS; |
164 | } |
165 | } |
165 | 166 | ||
166 | 167 |