Merge branch 'master' into int-new (b66a9e2f) · Commits · 戴 / Bird

client/birdc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ input_init(void)

		// readline library does strange things when stdin is nonblocking.
		// if (fcntl(0, F_SETFL, O_NONBLOCK) < 0)
		// die("fcntl: %m");
		// DIE("fcntl");
		}

		static void

client/birdcl.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		#include <stdlib.h>
		#include <unistd.h>
		#include <termios.h>
		#include <errno.h>

		#include <sys/ioctl.h>
		#include <signal.h>
		@@ -109,7 +110,7 @@ more_begin(void)
		tty.c_lflag &= (~ICANON);

		if (tcsetattr (0, TCSANOW, &tty) < 0)
		die("tcsetattr: %m");
		DIE("tcsetattr");

		more_active = 1;
		}
		@@ -120,7 +121,7 @@ more_end(void)
		more_active = 0;

		if (tcsetattr (0, TCSANOW, &stored_tty) < 0)
		die("tcsetattr: %m");
		DIE("tcsetattr");
		}

		static void
		@@ -137,7 +138,7 @@ input_init(void)
		return;

		if (tcgetattr(0, &stored_tty) < 0)
		die("tcgetattr: %m");
		DIE("tcgetattr");

		if (signal(SIGINT, sig_handler) == SIG_IGN)
		signal(SIGINT, SIG_IGN);

client/client.c

+8 −21

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ server_connect(void)

		server_fd = socket(AF_UNIX, SOCK_STREAM, 0);
		if (server_fd < 0)
		die("Cannot create socket: %m");
		DIE("Cannot create socket");

		if (strlen(server_path) >= sizeof(sa.sun_path))
		die("server_connect: path too long");
		@@ -257,9 +257,9 @@ server_connect(void)
		sa.sun_family = AF_UNIX;
		strcpy(sa.sun_path, server_path);
		if (connect(server_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) < 0)
		die("Unable to connect to server control socket (%s): %m", server_path);
		DIE("Unable to connect to server control socket (%s)", server_path);
		if (fcntl(server_fd, F_SETFL, O_NONBLOCK) < 0)
		die("fcntl: %m");
		DIE("fcntl");
		}


		@@ -309,13 +309,13 @@ server_read(void)
		redo:
		c = read(server_fd, server_read_pos, server_read_buf + sizeof(server_read_buf) - server_read_pos);
		if (!c)
		die("Connection closed by server.");
		die("Connection closed by server");
		if (c < 0)
		{
		if (errno == EINTR)
		goto redo;
		else
		die("Server read error: %m");
		DIE("Server read error");
		}

		start = server_read_buf;
		@@ -366,7 +366,7 @@ select_loop(void)
		if (errno == EINTR)
		continue;
		else
		die("select: %m");
		DIE("select");
		}

		if (FD_ISSET(0, &select_fds))
		@@ -399,7 +399,7 @@ wait_for_write(int fd)
		if (errno == EINTR)
		continue;
		else
		die("select: %m");
		DIE("select");
		}

		if (FD_ISSET(server_fd, &set))
		@@ -426,7 +426,7 @@ server_send(char *cmd)
		else if (errno == EINTR)
		continue;
		else
		die("Server write error: %m");
		DIE("Server write error");
		}
		else
		{
		@@ -436,19 +436,6 @@ server_send(char *cmd)
		}
		}


		/* XXXX

		get_term_size();

		if (tcgetattr(0, &tty_save) != 0)
		{
		perror("tcgetattr error");
		return(EXIT_FAILURE);
		}
		}

		*/
		int
		main(int argc, char **argv)
		{

client/client.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -34,3 +34,6 @@ char cmd_expand(char cmd);
		/* client.c */

		void submit_command(char *cmd_raw);

		/* die() with system error messages */
		#define DIE(x, y...) die(x ": %s", ##y, strerror(errno))

client/commands.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ cmd_build_tree(void)
		if (!new)
		{
		int size = sizeof(struct cmd_node) + c-d;
		new = xmalloc(size);
		new = malloc(size);
		bzero(new, size);
		*old->plastson = new;
		old->plastson = &new->sibling;
		@@ -314,7 +314,7 @@ cmd_expand(char *cmd)
		puts("No such command. Press `?' for help.");
		return NULL;
		}
		b = xmalloc(strlen(n->cmd->command) + strlen(args) + 1);
		b = malloc(strlen(n->cmd->command) + strlen(args) + 1);
		sprintf(b, "%s%s", n->cmd->command, args);
		return b;
		}

Admin message