From e5633a30e4a30a8096208c179ef4a36378ba106a Mon Sep 17 00:00:00 2001
From: LuckyLaszlo <luke.perrey.dev@gmail.com>
Date: Fri, 29 Jul 2022 16:05:43 +0200
Subject: [PATCH] perror() message fix + created dir for next split of
 Webserv.cpp

---
 .gitignore                     |  2 ++
 Makefile                       |  2 +-
 srcs/{ => webserv}/Webserv.cpp | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 13 deletions(-)
 rename srcs/{ => webserv}/Webserv.cpp (95%)

diff --git a/.gitignore b/.gitignore
index cc50a14..01a1610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ Thumbs.db
 ubuntu_tester
 ubuntu_cgi_tester
 webserv
+!**/webserv/
+*.log
diff --git a/Makefile b/Makefile
index 754f0c2..2d13022 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ HEADERS_D	 =	srcs
 				Client.hpp \
 				Server.hpp
 
-SRCS_D		 =	srcs
+SRCS_D		 =	srcs srcs/webserv
 SRCS		 =	main.cpp \
 				ft_itoa.cpp \
 				Webserv.cpp
diff --git a/srcs/Webserv.cpp b/srcs/webserv/Webserv.cpp
similarity index 95%
rename from srcs/Webserv.cpp
rename to srcs/webserv/Webserv.cpp
index 537e274..836343c 100644
--- a/srcs/Webserv.cpp
+++ b/srcs/webserv/Webserv.cpp
@@ -15,7 +15,7 @@ Webserv::Webserv()
 	_epfd = ::epoll_create1(0); // (EPOLL_CLOEXEC) for CGI fork ?
 	if (_epfd == -1)
 	{
-		std::perror("err epoll_create1(): ");
+		std::perror("err epoll_create1()");
 		throw std::runtime_error("Epoll init");
 	}
 
@@ -49,7 +49,7 @@ void	Webserv::init_virtual_servers() // ADD config param
 	_socket_fd = ::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); // (SOCK_CLOEXEC) for CGI fork ?
 	if (_socket_fd == -1)
 	{
-		std::perror("err socket(): ");
+		std::perror("err socket()");
 		throw std::runtime_error("Socket init");
 	}
 
@@ -75,7 +75,7 @@ void	Webserv::start()
 		nfds = ::epoll_wait(_epfd, events, MAX_EVENTS, TIMEOUT);
 		if (nfds == -1)
 		{
-			std::perror("err epoll_wait(): ");
+			std::perror("err epoll_wait()");
 			throw std::runtime_error("Epoll wait");
 		}
 		else if (nfds == 0)
@@ -118,7 +118,7 @@ void	Webserv::_accept_connection(int fd)
 	accepted_fd = ::accept(fd, (sockaddr*)&addr, &addr_len);
 	if (accepted_fd == -1)
 	{
-		std::perror("err accept(): ");
+		std::perror("err accept()");
 		return ;
 	}
 	::fcntl(accepted_fd, F_SETFL, O_NONBLOCK);
@@ -147,7 +147,7 @@ void	Webserv::_read_request(Client *client)
 	ret = ::recv(client->fd, buf, BUFSIZE, 0);
 	if (ret == -1)
 	{
-		std::perror("err recv(): ");
+		std::perror("err recv()");
 		// if (g_last_signal)
 			// _handle_last_signal();
 		// else
@@ -191,7 +191,7 @@ void	Webserv::_send_response(Client *client)
 	ret = ::send(client->fd, client->response.data(), client->response.size(), 0);
 	if (ret == -1)
 	{
-		std::perror("err send(): ");
+		std::perror("err send()");
 		if (g_last_signal)
 			_handle_last_signal();
 		// else
@@ -323,7 +323,7 @@ int	Webserv::_epoll_update(int fd, uint32_t events, int op)
 	ev.data.fd = fd;
 	if (::epoll_ctl(_epfd, op, fd, &ev) == -1)
 	{
-		std::perror("err _epoll_update(): ");
+		std::perror("err _epoll_update()");
 		return (-1);
 	}
 	return (0);
@@ -337,7 +337,7 @@ int	Webserv::_epoll_update(int fd, uint32_t events, int op, void *ptr)
 	ev.data.ptr = ptr;
 	if (::epoll_ctl(_epfd, op, fd, &ev) == -1)
 	{
-		std::perror("err _epoll_update(): ");
+		std::perror("err _epoll_update()");
 		return (-1);
 	}
 	return (0);
@@ -371,7 +371,7 @@ void	Webserv::_close_client(int fd)
 		{
 			// _epoll_update(fd, 0, EPOLL_CTL_DEL); // normalement superflu, DEBUG
 			if (::close(fd) == -1)
-				std::perror("err close(): ");
+				std::perror("err close()");
 			else
 				std::cerr << "close fd " << fd << "\n";
 			_clients.erase(it);
@@ -387,7 +387,7 @@ void	Webserv::_close_all_clients()
 	{
 		// _epoll_update(_clients.back().fd, 0, EPOLL_CTL_DEL); // normalement superflu, DEBUG
 		if (::close(_clients.back().fd) == -1)
-			std::perror("err close(): ");
+			std::perror("err close()");
 		else
 			std::cerr << "close fd " << _clients.back().fd << "\n";
 		_clients.pop_back();
@@ -411,7 +411,7 @@ void	Webserv::_bind(int socket_fd, in_port_t port)
 
 	if (::bind(socket_fd, (const sockaddr*)&addr, sizeof addr) == -1)
 	{
-		std::perror("err bind(): ");
+		std::perror("err bind()");
 		throw std::runtime_error("Socket bind");		
 	}
 }
@@ -420,7 +420,7 @@ void	Webserv::_listen(int socket_fd, unsigned int max_connections)
 {
 	if (::listen(socket_fd, max_connections) == -1)
 	{
-		std::perror("err listen(): ");
+		std::perror("err listen()");
 		throw std::runtime_error("Socket listen");
 	}
 }