Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit d3ba096

Browse files
committed
Move coreutils to single source files instead of their own directories
1 parent 2866afe commit d3ba096

36 files changed

+28
-115
lines changed

programs/coreutils/CMakeLists.txt

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
1-
ADD_SUBDIRECTORY(ls/)
2-
ADD_SUBDIRECTORY(cat/)
3-
ADD_SUBDIRECTORY(cp/)
4-
ADD_SUBDIRECTORY(ps/)
5-
ADD_SUBDIRECTORY(pwd/)
6-
ADD_SUBDIRECTORY(rm/)
7-
ADD_SUBDIRECTORY(ln/)
8-
ADD_SUBDIRECTORY(mv/)
9-
ADD_SUBDIRECTORY(rmdir/)
10-
ADD_SUBDIRECTORY(mkdir/)
11-
ADD_SUBDIRECTORY(touch/)
12-
ADD_SUBDIRECTORY(truncate/)
13-
ADD_SUBDIRECTORY(echo/)
14-
ADD_SUBDIRECTORY(chmod/)
15-
ADD_SUBDIRECTORY(chown/)
16-
ADD_SUBDIRECTORY(free/)
17-
ADD_SUBDIRECTORY(apprun/)
1+
function(MAKE_COREUTIL PROGNAME)
2+
SET(SOURCES ${PROGNAME}.cpp)
3+
MAKE_PROGRAM(${PROGNAME})
4+
endfunction()
5+
6+
MAKE_COREUTIL(apprun)
7+
TARGET_LINK_LIBRARIES(apprun libapp)
8+
MAKE_COREUTIL(cat)
9+
TARGET_LINK_LIBRARIES(cat libduck)
10+
MAKE_COREUTIL(chmod)
11+
MAKE_COREUTIL(chown)
12+
MAKE_COREUTIL(cp)
13+
MAKE_COREUTIL(echo)
14+
MAKE_COREUTIL(free)
15+
TARGET_LINK_LIBRARIES(free libsys)
16+
MAKE_COREUTIL(ln)
17+
MAKE_COREUTIL(ls)
18+
TARGET_LINK_LIBRARIES(ls libduck)
19+
MAKE_COREUTIL(mkdir)
20+
MAKE_COREUTIL(mv)
21+
MAKE_COREUTIL(ps)
22+
TARGET_LINK_LIBRARIES(ps libsys)
23+
MAKE_COREUTIL(pwd)
24+
MAKE_COREUTIL(rm)
25+
MAKE_COREUTIL(rmdir)
26+
MAKE_COREUTIL(touch)
27+
MAKE_COREUTIL(truncate)
File renamed without changes.

programs/coreutils/apprun/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/cat/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

programs/coreutils/cat/main.c

Lines changed: 0 additions & 58 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/chmod/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/chown/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

programs/coreutils/cp/main.c renamed to programs/coreutils/cp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
5555
errno = 0;
5656

5757
ssize_t nread;
58-
char* buf = malloc(1024);
58+
auto* buf = (char*) malloc(1024);
5959
while((nread = read(from_fd, buf, 1024))) {
6060
ssize_t nwrote;
6161
nwrote = write(to_fd, buf, nread);

programs/coreutils/cp/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/echo/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/free/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/ln/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/ls/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/mkdir/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/mv/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/ps/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/pwd/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/rm/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/rmdir/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/touch/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.

programs/coreutils/truncate/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)