Skip to content
Snippets Groups Projects
Unverified Commit 1e661cdb authored by Jeremy Soller's avatar Jeremy Soller Committed by GitHub
Browse files

Merge branch 'master' into wait

parents 211f9515 13b71199
No related branches found
No related tags found
1 merge request!74wait and waitpid
...@@ -18,10 +18,10 @@ fcntl = { path = "src/fcntl" } ...@@ -18,10 +18,10 @@ fcntl = { path = "src/fcntl" }
fenv = { path = "src/fenv" } fenv = { path = "src/fenv" }
float = { path = "src/float" } float = { path = "src/float" }
grp = { path = "src/grp" } grp = { path = "src/grp" }
semaphore = { path = "src/semaphore" }
mman = { path = "src/mman" } mman = { path = "src/mman" }
platform = { path = "src/platform" } platform = { path = "src/platform" }
resource = { path = "src/resource" } resource = { path = "src/resource" }
semaphore = { path = "src/semaphore" }
stat = { path = "src/stat" } stat = { path = "src/stat" }
stdio = { path = "src/stdio" } stdio = { path = "src/stdio" }
stdlib = { path = "src/stdlib" } stdlib = { path = "src/stdlib" }
......
...@@ -7,8 +7,11 @@ extern crate platform; ...@@ -7,8 +7,11 @@ extern crate platform;
extern crate ctype; extern crate ctype;
extern crate errno; extern crate errno;
extern crate fcntl; extern crate fcntl;
extern crate fenv;
extern crate float;
extern crate grp; extern crate grp;
extern crate mman; extern crate mman;
extern crate resource;
extern crate semaphore; extern crate semaphore;
extern crate stat; extern crate stat;
extern crate stdio; extern crate stdio;
......
...@@ -16,5 +16,5 @@ int main(int argc, char ** argv) { ...@@ -16,5 +16,5 @@ int main(int argc, char ** argv) {
ptrc[i] = (char)i; ptrc[i] = (char)i;
} }
free(ptrc); free(ptrc);
return 0;
} }
...@@ -8,4 +8,5 @@ int main(int argc, char ** argv) { ...@@ -8,4 +8,5 @@ int main(int argc, char ** argv) {
write(STDOUT_FILENO, " ", 1); write(STDOUT_FILENO, " ", 1);
} }
write(STDOUT_FILENO, "\n", 1); write(STDOUT_FILENO, "\n", 1);
return 0;
} }
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
int main(int argc, char** argv) { int main(int argc, char** argv) {
int status = brk((void*)100); int status = brk((void*)100);
printf("brk exited with status code %d\n", status); printf("brk exited with status code %d\n", status);
return 0;
} }
...@@ -12,4 +12,5 @@ int main(int argc, char** argv) { ...@@ -12,4 +12,5 @@ int main(int argc, char** argv) {
getcwd(cwd2, 4096); getcwd(cwd2, 4096);
printf("final cwd: %s\n", cwd2); printf("final cwd: %s\n", cwd2);
free(cwd2); free(cwd2);
return 0;
} }
...@@ -13,4 +13,5 @@ int main(int argc, char** argv) { ...@@ -13,4 +13,5 @@ int main(int argc, char** argv) {
dup2(fd3, 1); dup2(fd3, 1);
printf("hello fd %d", fd3); printf("hello fd %d", fd3);
close(fd3); close(fd3);
return 0;
} }
...@@ -7,4 +7,5 @@ int main(int argc, char** argv) { ...@@ -7,4 +7,5 @@ int main(int argc, char** argv) {
chdir("nonexistent"); chdir("nonexistent");
printf("errno: %d = %s\n", errno, strerror(errno)); printf("errno: %d = %s\n", errno, strerror(errno));
perror("perror"); perror("perror");
return 0;
} }
...@@ -8,4 +8,5 @@ int main (int argc, char** argv) { ...@@ -8,4 +8,5 @@ int main (int argc, char** argv) {
status = fchdir(fd); status = fchdir(fd);
printf("fchdir exited with status code %d\n", status); printf("fchdir exited with status code %d\n", status);
close(fd); close(fd);
return 0;
} }
...@@ -10,4 +10,5 @@ int main() { ...@@ -10,4 +10,5 @@ int main() {
printf("fd %d duped into fd %d\n", newfd, newfd2); printf("fd %d duped into fd %d\n", newfd, newfd2);
close(newfd); close(newfd);
close(newfd2); close(newfd2);
return 0;
} }
...@@ -8,4 +8,5 @@ int main (int argc, char** argv) { ...@@ -8,4 +8,5 @@ int main (int argc, char** argv) {
status = fsync(fd); status = fsync(fd);
printf("fsync exited with status code %d\n", status); printf("fsync exited with status code %d\n", status);
close(fd); close(fd);
return 0;
} }
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
#include <stdio.h> #include <stdio.h>
int main (int argc, char** argv) { int main (int argc, char** argv) {
int fd = creat("ftruncate.out", 0777); int fd = creat("ftruncate.out", 0777);
int status; int status;
status = ftruncate(fd, 100); status = ftruncate(fd, 100);
printf("ftruncate exited with status code %d\n", status); printf("ftruncate exited with status code %d\n", status);
close(fd); close(fd);
return 0;
} }
...@@ -11,4 +11,5 @@ int main(int argc, char** argv) { ...@@ -11,4 +11,5 @@ int main(int argc, char** argv) {
uid_t uid = getuid(); uid_t uid = getuid();
printf("egid: %d, euid: %d, gid: %d, pgid: %d, pid: %d, ppid %d, uid %d\n", printf("egid: %d, euid: %d, gid: %d, pgid: %d, pid: %d, ppid %d, uid %d\n",
egid, euid, gid, pgid, pid, ppid, uid); egid, euid, gid, pgid, pid, ppid, uid);
return 0;
} }
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
int main(int argc, char** argv) { int main(int argc, char** argv) {
link("./link.c", "./link.out"); link("./link.c", "./link.out");
perror("link"); perror("link");
return 0;
} }
...@@ -5,4 +5,5 @@ int main(int argc, char ** argv) { ...@@ -5,4 +5,5 @@ int main(int argc, char ** argv) {
double pi = 3.14; double pi = 3.14;
float c = cos(pi); float c = cos(pi);
printf("cos(%f) = %f\n", pi, c); printf("cos(%f) = %f\n", pi, c);
return 0;
} }
...@@ -20,4 +20,5 @@ int main(int argc, char ** argv) { ...@@ -20,4 +20,5 @@ int main(int argc, char ** argv) {
exit(1); exit(1);
} }
printf("Correct memccpy\n"); printf("Correct memccpy\n");
return 0;
} }
...@@ -30,4 +30,5 @@ int main() ...@@ -30,4 +30,5 @@ int main()
/* close read end */ /* close read end */
close(pip[0]); close(pip[0]);
} }
return 0;
} }
...@@ -6,4 +6,5 @@ int main(int argc, char** argv) { ...@@ -6,4 +6,5 @@ int main(int argc, char** argv) {
mkdir("foo", 0); mkdir("foo", 0);
int status = rmdir("foo"); int status = rmdir("foo");
printf("rmdir exited with status code %d\n", status); printf("rmdir exited with status code %d\n", status);
return 0;
} }
...@@ -23,4 +23,5 @@ int main( void ) ...@@ -23,4 +23,5 @@ int main( void )
perror( "setreuid" ); perror( "setreuid" );
} }
printf("%d has euid %d and uid %d\n", getpid(), geteuid(), getuid()); printf("%d has euid %d and uid %d\n", getpid(), geteuid(), getuid());
return 0;
} }
...@@ -10,4 +10,5 @@ int main(int argc, char** argv) { ...@@ -10,4 +10,5 @@ int main(int argc, char** argv) {
timespec tm = {0, 10000}; timespec tm = {0, 10000};
nanosleep(&tm, NULL); nanosleep(&tm, NULL);
perror("nanosleep"); perror("nanosleep");
return 0;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment