refactor data handling into data.c

[log-plotter] / main.c

diff --git a/main.c b/main.c
index 6189b7be34b7048123c441f8ea1c33e96c258741..51e52605dafc2590a9cd160da1f2d014e0516d98 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,69 +1,16 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/epoll.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #include "options.h"
 #include "baud.h"
 #include "debug.h"
-
-int read_data(int infd, int outfd)
-{
-       struct epoll_event ev;
-       int epoll_fd;
-       int ret;
-       char buf[256];
-
-       epoll_fd = epoll_create(1);
-       if (epoll_fd < 0) {
-               pr_err("Failed to create epoll socket: %m\n");
-               return -1;
-       }
-
-       ev.events = EPOLLIN;
-       ev.data.fd = infd;
-       if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, infd, &ev) == -1) {
-               pr_err("epoll_ctl: %m\n");
-               return 1;
-       }
-
-       while (1) {
-               ret = epoll_wait(epoll_fd, &ev, 1, -1);
-               if (ret == 0)
-                       continue;
-
-               if (ret < 0) {
-                       pr_err("epoll: %m\n");
-                       return -1;
-               }
-
-               ret = read(infd, buf, sizeof(buf));
-               if (read < 0) {
-                       pr_err("read: %m\n");
-                       break;
-               }
-
-               if (ret == 0) {
-                       pr_err("Read EOF, stopping\n");
-                       break;
-               }
-
-               ret = write(outfd, buf, ret);
-               if (read < 0) {
-                       pr_err("write: %m\n");
-                       break;
-               }
-       }
-
-       return 0;
-}
+#include "data.h"
 
 int main(int argc, char *argv[])
 {
        struct plotter_options options;
-       int fd, baud, ret = 0, out_fd = STDOUT_FILENO;
+       int fd, baud, ret = 0, out_fd = 0;
 
        if (read_args(argc, argv, &options))
                return 1;