Fix remaining zgrep(1) wrapper script regressions
ClosedPublic
Actions

Authored by leres on Feb 6 2025, 10:13 PM.

Details

Reviewers

markj
kevans
ngie
bapt

Commits

rG1070477cc8b7: Fix remaining zgrep(1) wrapper script regressions

Summary

Fix short flags without whitespace, e.g:

zgrep -wefoo test

Fix multiple -e flags:

zgrep -e foo -e xxx test

Previously only the last pattern would be used.

Clean up possible leading blank in ${grep_args}.

Update comment: 2.51 -> 2.6.0

Add a test case for the last known zgrep wrapper issue: recursion
(-r) not implemented.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 62318
Build 59202: arc lint + arc unit

Event Timeline

leres created this revision.Feb 6 2025, 10:13 PM

Herald added a subscriber: imp. · View Herald TranscriptFeb 6 2025, 10:13 PM

leres requested review of this revision.Feb 6 2025, 10:13 PM

Harbormaster completed remote builds in B62285: Diff 150653.Feb 6 2025, 10:13 PM

better test for more than one pattern

Harbormaster completed remote builds in B62318: Diff 150724.Feb 8 2025, 9:21 PM

markj accepted this revision.Feb 9 2025, 3:24 PM

This revision is now accepted and ready to land.Feb 9 2025, 3:24 PM

Closed by commit rG1070477cc8b7: Fix remaining zgrep(1) wrapper script regressions (authored by leres). · Explain WhyFeb 9 2025, 6:45 PM

This revision was automatically updated to reflect the committed changes.

leres added a commit: rG1070477cc8b7: Fix remaining zgrep(1) wrapper script regressions.

leres mentioned this in D47478: zfsboot: Add an option to edit the ZFS pool creation options..Feb 9 2025, 7:01 PM

Revision Contents
Changeset List

Path

Size

contrib/

netbsd-tests/

usr.bin/

grep/

t_grep.sh

24 lines

usr.bin/

grep/

zgrep.sh

52 lines

Diff 150724

View Options

contrib/netbsd-tests/usr.bin/grep/t_grep.sh

Show All 36 Lines
#include <sys/mutex.h>		#include <sys/mutex.h>
#include <sys/pcpu.h>		#include <sys/pcpu.h>
#include <sys/proc.h>		#include <sys/proc.h>
#include <sys/socket.h>		#include <sys/socket.h>
#include <sys/socketvar.h>		#include <sys/socketvar.h>
#include <sys/time.h>		#include <sys/time.h>
#include <sys/uio.h>		#include <sys/uio.h>

		#include <netinet/tcp.h>

#include <rpc/rpc.h>		#include <rpc/rpc.h>
#include <rpc/rpc_com.h>		#include <rpc/rpc_com.h>
#include <rpc/krpc.h>		#include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h>		#include <rpc/rpcsec_tls.h>

static enum clnt_stat clnt_reconnect_call(CLIENT , struct rpc_callextra ,		static enum clnt_stat clnt_reconnect_call(CLIENT , struct rpc_callextra ,
rpcproc_t, struct mbuf , struct mbuf *, struct timeval);		rpcproc_t, struct mbuf , struct mbuf *, struct timeval);
static void clnt_reconnect_geterr(CLIENT , struct rpc_err );		static void clnt_reconnect_geterr(CLIENT , struct rpc_err );
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines	clnt_reconnect_create(
rc->rc_retries = INT_MAX;		rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE;		rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv";		rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0;		rc->rc_intr = 0;
rc->rc_connecting = FALSE;		rc->rc_connecting = FALSE;
rc->rc_closed = FALSE;		rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred);		rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL;		rc->rc_client = NULL;
		rc->rc_ddp = false;
rc->rc_tls = false;		rc->rc_tls = false;
rc->rc_tlscertname = NULL;		rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL;		rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL;		rc->rc_reconarg = NULL;

cl->cl_refs = 1;		cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops;		cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc;		cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines	if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0;		rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient);		CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient);		CLNT_RELEASE(newclient);
newclient = NULL;		newclient = NULL;
td->td_ucred = oldcred;		td->td_ucred = oldcred;
goto out;		goto out;
}		}
}		}
		if (rc->rc_ddp && newclient != NULL) {
		int optval = 1;

		(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
		&optval, sizeof(optval));
		}
		rmacklemUnsubmitted Not Done Inline Actions Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would be done for CLSET_TCP_DDP in clnt_vc.c and ignored in clnt_dg.c. I've never been much of an object oriented guy, but the Sun folk loved these layers. rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL)		if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg,		(*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred);		rc->rc_ucred);
}		}
td->td_ucred = oldcred;		td->td_ucred = oldcred;

if (!newclient) {		if (!newclient) {
soclose(so);		soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines	case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen);		rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen);		strlcpy(rc->rc_tlscertname, info, slen);
break;		break;

case CLSET_RECONUPCALL:		case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info;		upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call;		rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg;		rc->rc_reconarg = upcp->arg;
		break;

		case CLSET_DDP:
		rc->rc_ddp = true;
break;		break;

default:		default:
return (FALSE);		return (FALSE);
}		}

return (TRUE);		return (TRUE);
}		}
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines