diff options
| author | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-03-31 21:26:47 +0200 |
|---|---|---|
| committer | Alejandro Colomar <colomar.6.4.3@gmail.com> | 2020-03-31 21:26:47 +0200 |
| commit | 1a6ac07c8ac6230de03879985aa35361a4131f05 (patch) | |
| tree | c4e86886454674334e78cc3e00b83c97c2b95fe4 | |
| parent | f6e2c103444ed593c90b419dab727dce939e43fb (diff) | |
| parent | 890620211e45d891d7c1b4371853a0acd43c38d6 (diff) | |
Merge branch 'rob'
| -rw-r--r-- | rob/Dockerfile | 2 | ||||
| -rw-r--r-- | rob/rob.c | 18 | ||||
| -rw-r--r-- | rob/robot/ur/ur-sim.c | 20 |
3 files changed, 18 insertions, 22 deletions
diff --git a/rob/Dockerfile b/rob/Dockerfile index bb88de7..4fc3001 100644 --- a/rob/Dockerfile +++ b/rob/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stable AS build +FROM debian:stable-slim AS build RUN apt-get update && \ apt-get upgrade -V --yes && \ apt-get install -V \ @@ -18,17 +18,13 @@ #define ALX_NO_PREFIX #include <libalx/alx/robot/ur/ur.h> -#include <libalx/base/compiler/size.h> -#include <libalx/base/compiler/unused.h> -#include <libalx/base/errno/perror.h> -#include <libalx/base/linux/membarrier.h> -#include <libalx/base/signal/sigpipe.h> -#include <libalx/base/signal/sigterm.h> -#include <libalx/base/socket/tcp/server.h> -#include <libalx/base/stdio/printf/sbprintf.h> -#include <libalx/base/stdlib/getenv/getenv_i.h> -#include <libalx/base/stdlib/getenv/getenv_s.h> -#include <libalx/base/sys/types.h> +#include <libalx/base/compiler.h> +#include <libalx/base/errno.h> +#include <libalx/base/linux.h> +#include <libalx/base/signal.h> +#include <libalx/base/stdio.h> +#include <libalx/base/stdlib.h> +#include <libalx/base/sys.h> #include <libalx/extra/telnet-tcp/client/client.h> diff --git a/rob/robot/ur/ur-sim.c b/rob/robot/ur/ur-sim.c index 32e7c60..22a9f80 100644 --- a/rob/robot/ur/ur-sim.c +++ b/rob/robot/ur/ur-sim.c @@ -20,10 +20,10 @@ #include <unistd.h> #define ALX_NO_PREFIX -#include <libalx/base/compiler/size.h> -#include <libalx/base/errno/perror.h> -#include <libalx/base/socket/tcp/server.h> -#include <libalx/base/stdio/printf/sbprintf.h> +#include <libalx/base/compiler.h> +#include <libalx/base/errno.h> +#include <libalx/base/stdio.h> +#include <libalx/base/sys.h> /****************************************************************************** @@ -86,12 +86,12 @@ err: ******************************************************************************/ int main (void) { - int tcp; - int rob; + int tcp; + int rob; struct sockaddr_storage cli_addr = {0}; - socklen_t cli_addr_len; - int status; - pid_t pid; + socklen_t cli_addr_len; + int status; + pid_t pid; status = EXIT_FAILURE; tcp = tcp_server_open(SERVER_PORT, LISTEN_BACKLOG); @@ -110,7 +110,7 @@ int main (void) } pid = fork(); - if (pid == -1) { + if (pid < 0) { fprintf(stderr, "session#%i: fork() failed\n", i); continue; } else if (!pid) { |