From owner-svn-ports-head@FreeBSD.ORG Thu Aug 23 08:59:31 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EF691065672; Thu, 23 Aug 2012 08:59:31 +0000 (UTC) (envelope-from sumikawa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 501F58FC1B; Thu, 23 Aug 2012 08:59:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7N8xV35092053; Thu, 23 Aug 2012 08:59:31 GMT (envelope-from sumikawa@svn.freebsd.org) Received: (from sumikawa@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7N8xVrb092050; Thu, 23 Aug 2012 08:59:31 GMT (envelope-from sumikawa@svn.freebsd.org) Message-Id: <201208230859.q7N8xVrb092050@svn.freebsd.org> From: Munechika SUMIKAWA Date: Thu, 23 Aug 2012 08:59:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302983 - in head/misc/lv: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2012 08:59:31 -0000 Author: sumikawa Date: Thu Aug 23 08:59:30 2012 New Revision: 302983 URL: http://svn.freebsd.org/changeset/ports/302983 Log: Show error when opening a directory'. It's the same behavior with less. PR: 162050 Submitted by: Koichiro IWAO Added: head/misc/lv/files/patch-src_lv.c (contents, props changed) Modified: head/misc/lv/Makefile Modified: head/misc/lv/Makefile ============================================================================== --- head/misc/lv/Makefile Thu Aug 23 08:36:42 2012 (r302982) +++ head/misc/lv/Makefile Thu Aug 23 08:59:30 2012 (r302983) @@ -7,7 +7,7 @@ PORTNAME= lv PORTVERSION= 4.51 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://www.ff.iij4u.or.jp/~nrt/freeware/ DISTNAME= lv451 Added: head/misc/lv/files/patch-src_lv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/lv/files/patch-src_lv.c Thu Aug 23 08:59:30 2012 (r302983) @@ -0,0 +1,49 @@ +--- lv.c.orig 2004-01-05 16:30:15.000000000 +0900 ++++ lv.c 2012-08-23 16:49:46.728726453 +0900 +@@ -2,6 +2,7 @@ + * lv.c + * + * All rights reserved. Copyright (C) 1996 by NARITA Tomio. ++ * Copyright (C) Oct 27, 2011 Koichiro IWAO. All rights reserved. + * $Id: lv.c,v 1.10 2004/01/05 07:30:15 nrt Exp $ + */ + /* +@@ -89,16 +90,35 @@ + grep_mode = FALSE; + } + ++private boolean_t isDirectory(byte **file) { ++ struct stat buf; ++ stat((unsigned char *)file, &buf); ++ if (S_ISDIR(buf.st_mode)) { ++ fprintf(stderr, "%s is a directory\n", file); ++ return TRUE; ++ } else { ++ return FALSE; ++ } ++} ++ + private boolean_t LvOpen( conf_t *conf ) + { ++ boolean_t flagIsDirectory = FALSE; ++ + if( NULL != conf->file ){ ++ if( TRUE == isDirectory( *conf->file ) ){ ++ flagIsDirectory = TRUE; ++ } + if( NULL == (conf->st = StreamOpen( *conf->file )) ){ + while( NULL != *(++conf->file) ){ +- if( NULL != (conf->st = StreamOpen( *conf->file )) ) +- return TRUE; ++ if( NULL != (conf->st = StreamOpen( *conf->file )) ){ ++ if( TRUE == isDirectory( *conf->file ) ){ ++ flagIsDirectory = TRUE; ++ } ++ } + } +- return FALSE; + } ++ return (TRUE == flagIsDirectory ? FALSE : TRUE); + } else { + conf->st = StreamReconnectStdin(); + }