From owner-freebsd-bugs@FreeBSD.ORG Mon Apr 28 03:50:19 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCFC437B401 for ; Mon, 28 Apr 2003 03:50:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CD3543FBF for ; Mon, 28 Apr 2003 03:50:17 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3SAoHUp079062 for ; Mon, 28 Apr 2003 03:50:17 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3SAoHXx079059; Mon, 28 Apr 2003 03:50:17 -0700 (PDT) Resent-Date: Mon, 28 Apr 2003 03:50:17 -0700 (PDT) Resent-Message-Id: <200304281050.h3SAoHXx079059@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Sivachenko Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D63E37B401 for ; Mon, 28 Apr 2003 03:44:14 -0700 (PDT) Received: from tear.demos.su (tear.demos.su [194.87.2.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E5F543F3F for ; Mon, 28 Apr 2003 03:44:13 -0700 (PDT) (envelope-from mitya@tear.demos.su) Received: from tear.demos.su (localhost [127.0.0.1]) by tear.demos.su (8.12.9/8.12.9) with ESMTP id h3SAi4XG000342 for ; Mon, 28 Apr 2003 14:44:04 +0400 (MSD) (envelope-from mitya@tear.demos.su) Received: (from root@localhost) by tear.demos.su (8.12.9/8.12.9/Submit) id h3SAi4j1000341; Mon, 28 Apr 2003 14:44:04 +0400 (MSD) Message-Id: <200304281044.h3SAi4j1000341@tear.demos.su> Date: Mon, 28 Apr 2003 14:44:04 +0400 (MSD) From: Dmitry Sivachenko To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: bin/51488: Compat patch: more(1) allowed filename to start with '+' X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Apr 2003 10:50:19 -0000 >Number: 51488 >Category: bin >Synopsis: Compat patch: more(1) allowed filename to start with '+' >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Apr 28 03:50:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Dmitry Sivachenko >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD tear.demos.su 4.8-STABLE FreeBSD 4.8-STABLE #2: Mon Apr 28 14:27:07 MSD 2003 mitya@tear.demos.su:/usr/src/sys/compile/TEAR i386 >Description: more(1), before it became an alias to less(1), allowed filename to start with '+'. Thus, `more +abc` was legal request to view file '+abc'. less(1) treats leading '+' symbol specially. The following patch restores old behaviour (only when invoked as 'more'). >How-To-Repeat: >Fix: --- main.c.orig Mon Apr 28 14:36:38 2003 +++ main.c Mon Apr 28 14:38:21 2003 @@ -125,7 +125,8 @@ if (s != NULL) scan_option(save(s)); -#define isoptstring(s) (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') +#define isoptstring(s) more_mode ? (((s)[0] == '-') && (s)[1] != '\0') : \ + (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') while (argc > 0 && (isoptstring(*argv) || isoptpending())) { s = *argv++; >Release-Note: >Audit-Trail: >Unformatted: