socket-proxyd.c		socket-proxyd.c
	skipping to change at line 592		skipping to change at line 592
	* watching to accept(). */		* watching to accept(). */
	r = sd_event_source_set_enabled(source, SD_EVENT_ONESHOT);		r = sd_event_source_set_enabled(source, SD_EVENT_ONESHOT);
	if (r < 0) {		if (r < 0) {
	log_error("Failed to enable oneshot mode: %s", strerror(-r) );		log_error("Failed to enable oneshot mode: %s", strerror(-r) );
	return r;		return r;
	}		}
	return 0;		return 0;
	}		}
	static int help(void) {		static void help(void) {
			printf("%1$s [HOST:PORT]\n"
	printf("%s [HOST:PORT]\n"		"%1$s [SOCKET]\n\n"
	"%s [SOCKET]\n\n"
	"Bidirectionally proxy local sockets to another (possibly re mote) socket.\n\n"		"Bidirectionally proxy local sockets to another (possibly re mote) socket.\n\n"
	" -h --help Show this help\n"		" -h --help Show this help\n"
	" --version Show package version\n",		" --version Show package version\n",
	program_invocation_short_name,
	program_invocation_short_name);		program_invocation_short_name);
	return 0;
	}		}
	static int parse_argv(int argc, char *argv[]) {		static int parse_argv(int argc, char *argv[]) {
	enum {		enum {
	ARG_VERSION = 0x100,		ARG_VERSION = 0x100,
	ARG_IGNORE_ENV		ARG_IGNORE_ENV
	};		};
	static const struct option options[] = {		static const struct option options[] = {
	{ "help", no_argument, NULL, 'h' },		{ "help", no_argument, NULL, 'h' },
	{ "version", no_argument, NULL, ARG_VERSION },		{ "version", no_argument, NULL, ARG_VERSION },
	{}		{}
	};		};
	int c;		int c;
	assert(argc >= 0);		assert(argc >= 0);
	assert(argv);		assert(argv);
	while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {		while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
	switch (c) {		switch (c) {
	case 'h':		case 'h':
	return help();		help();
			return 0;
	case ARG_VERSION:		case ARG_VERSION:
	puts(PACKAGE_STRING);		puts(PACKAGE_STRING);
	puts(SYSTEMD_FEATURES);		puts(SYSTEMD_FEATURES);
	return 0;		return 0;
	case '?':		case '?':
	return -EINVAL;		return -EINVAL;
	default:		default:
	assert_not_reached("Unhandled option");		assert_not_reached("Unhandled option");
	}		}
	}
	if (optind >= argc) {		if (optind >= argc) {
	log_error("Not enough parameters.");		log_error("Not enough parameters.");
	return -EINVAL;		return -EINVAL;
	}		}
	if (argc != optind+1) {		if (argc != optind+1) {
	log_error("Too many parameters.");		log_error("Too many parameters.");
	return -EINVAL;		return -EINVAL;
	}		}
End of changes. 6 change blocks.
	10 lines changed or deleted		6 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/