Import OpenBSD's getopt(3) to workaround broken glibc version.

This commit is contained in:
Nicholas Marriott
2008-12-10 20:25:42 +00:00
parent 3b2859e9dc
commit 5c3d973a4a
29 changed files with 659 additions and 74 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: cmd-generic.c,v 1.14 2008-12-08 16:19:51 nicm Exp $ */
/* $Id: cmd-generic.c,v 1.15 2008-12-10 20:25:41 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,7 +18,6 @@
#include <sys/types.h>
#include <getopt.h>
#include <stdlib.h>
#include "tmux.h"
@@ -44,7 +43,7 @@ cmd_target_parse(struct cmd *self, int argc, char **argv, char **cause)
cmd_target_init(self, 0);
data = self->data;
while ((opt = getopt(argc, argv, GETOPT_PREFIX "dgkt:")) != EOF) {
while ((opt = getopt(argc, argv, "dgkt:")) != -1) {
switch (opt) {
case 'd':
if (self->entry->flags & CMD_DFLAG) {
@@ -174,7 +173,7 @@ cmd_srcdst_parse(struct cmd *self, int argc, char **argv, char **cause)
cmd_srcdst_init(self, 0);
data = self->data;
while ((opt = getopt(argc, argv, GETOPT_PREFIX "dgks:t:")) != EOF) {
while ((opt = getopt(argc, argv, "dgks:t:")) != -1) {
switch (opt) {
case 'd':
if (self->entry->flags & CMD_DFLAG) {
@@ -315,7 +314,7 @@ cmd_buffer_parse(struct cmd *self, int argc, char **argv, char **cause)
cmd_buffer_init(self, 0);
data = self->data;
while ((opt = getopt(argc, argv, GETOPT_PREFIX "b:dgkt:")) != EOF) {
while ((opt = getopt(argc, argv, "b:dgkt:")) != -1) {
switch (opt) {
case 'b':
if (data->buffer == -1) {
@@ -460,7 +459,7 @@ cmd_option_parse(struct cmd *self, int argc, char **argv, char **cause)
cmd_option_init(self, 0);
data = self->data;
while ((opt = getopt(argc, argv, GETOPT_PREFIX "dgkt:")) != EOF) {
while ((opt = getopt(argc, argv, "dgkt:")) != -1) {
switch (opt) {
case 'd':
if (self->entry->flags & CMD_DFLAG) {