From owner-svn-soc-all@FreeBSD.ORG Sat Jun 21 23:31:22 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6AE2B769 for ; Sat, 21 Jun 2014 23:31:22 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C34F2E26 for ; Sat, 21 Jun 2014 23:31:22 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LNVMsP039729 for ; Sat, 21 Jun 2014 23:31:22 GMT (envelope-from zkorchev@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5LNVKMp039180 for svn-soc-all@FreeBSD.org; Sat, 21 Jun 2014 23:31:20 GMT (envelope-from zkorchev@FreeBSD.org) Date: Sat, 21 Jun 2014 23:31:20 GMT Message-Id: <201406212331.s5LNVKMp039180@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to zkorchev@FreeBSD.org using -f From: zkorchev@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r269836 - soc2014/zkorchev/freebsd_head/bin/ls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 23:31:22 -0000 Author: zkorchev Date: Sat Jun 21 23:31:20 2014 New Revision: 269836 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269836 Log: ls fixes Modified: soc2014/zkorchev/freebsd_head/bin/ls/ls.1 soc2014/zkorchev/freebsd_head/bin/ls/ls.c soc2014/zkorchev/freebsd_head/bin/ls/print.c soc2014/zkorchev/freebsd_head/bin/ls/util.c Modified: soc2014/zkorchev/freebsd_head/bin/ls/ls.1 ============================================================================== --- soc2014/zkorchev/freebsd_head/bin/ls/ls.1 Sat Jun 21 23:30:31 2014 (r269835) +++ soc2014/zkorchev/freebsd_head/bin/ls/ls.1 Sat Jun 21 23:31:20 2014 (r269836) @@ -158,8 +158,6 @@ This option cancels the .Fl P option. -.It Fl O -Output the results in JSON format. .It Fl P If argument is a symbolic link, list the link itself rather than the object the link references. Modified: soc2014/zkorchev/freebsd_head/bin/ls/ls.c ============================================================================== --- soc2014/zkorchev/freebsd_head/bin/ls/ls.c Sat Jun 21 23:30:31 2014 (r269835) +++ soc2014/zkorchev/freebsd_head/bin/ls/ls.c Sat Jun 21 23:31:20 2014 (r269836) @@ -220,13 +220,6 @@ f_longform = 0; f_singlecol = 0; break; - case 'O': -#if defined(SOL_ON) - f_solformat = 1; -#else - errx(1, "ls compiled without -O support"); -#endif - break; /* The -c, -u, and -U options override each other. */ case 'c': f_statustime = 1; @@ -490,6 +483,7 @@ /* Select a print function. */ #if defined(SOL_ON) + f_solformat = sol_init(&sol_stream); if (f_solformat) { // TODO zaro compact and formatted output support, etc. @@ -512,11 +506,8 @@ } #if defined(SOL_ON) - if (f_solformat) { - sol_init(&sol_stream, SOL_JSON); - if (f_recursive || (argc > 1)) - sol_map_start(&sol_stream); - } + if (f_solformat && (f_recursive || (argc > 1))) + sol_map_start(&sol_stream); #endif if (argc) Modified: soc2014/zkorchev/freebsd_head/bin/ls/print.c ============================================================================== --- soc2014/zkorchev/freebsd_head/bin/ls/print.c Sat Jun 21 23:30:31 2014 (r269835) +++ soc2014/zkorchev/freebsd_head/bin/ls/print.c Sat Jun 21 23:31:20 2014 (r269836) @@ -789,7 +789,7 @@ if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) { SOL_MAP_KEYL(&sol_stream, "dev"); - sol_integer(&sol_stream, sp->st_rdev); // TODO hex? + sol_uinteger(&sol_stream, sp->st_rdev); } else { if (f_humanval) { Modified: soc2014/zkorchev/freebsd_head/bin/ls/util.c ============================================================================== --- soc2014/zkorchev/freebsd_head/bin/ls/util.c Sat Jun 21 23:30:31 2014 (r269835) +++ soc2014/zkorchev/freebsd_head/bin/ls/util.c Sat Jun 21 23:31:20 2014 (r269836) @@ -224,6 +224,6 @@ usage(void) { (void)fprintf(stderr, - "usage: ls [-ABCFGHILOPRSTUWZabcdfghiklmnopqrstuwxy1,] [-D format] [file ...]\n"); + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [-D format] [file ...]\n"); exit(1); }