From owner-svn-src-all@freebsd.org Fri Feb 16 03:12:25 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1ED1FF0D404; Fri, 16 Feb 2018 03:12:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C21F87F436; Fri, 16 Feb 2018 03:12:24 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD2CA27C57; Fri, 16 Feb 2018 03:12:24 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1G3COu4085742; Fri, 16 Feb 2018 03:12:24 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1G3CO3r085739; Fri, 16 Feb 2018 03:12:24 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802160312.w1G3CO3r085739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 16 Feb 2018 03:12:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329349 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329349 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Feb 2018 03:12:25 -0000 Author: kevans Date: Fri Feb 16 03:12:24 2018 New Revision: 329349 URL: https://svnweb.freebsd.org/changeset/base/329349 Log: stand/lua: Reduce magic numbers Enter/backspace values are hardcoded in both the menu and password scripts. Separate these out to core for reuse between the two. Modified: head/stand/lua/core.lua head/stand/lua/menu.lua head/stand/lua/password.lua Modified: head/stand/lua/core.lua ============================================================================== --- head/stand/lua/core.lua Fri Feb 16 01:33:01 2018 (r329348) +++ head/stand/lua/core.lua Fri Feb 16 03:12:24 2018 (r329349) @@ -28,6 +28,10 @@ local core = {}; +-- Commonly appearing constants +core.KEY_ENTER = 13 +core.KEY_BACKSPACE = 127 + function core.setVerbose(b) if (b == nil) then b = not core.verbose; Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Fri Feb 16 01:33:01 2018 (r329348) +++ head/stand/lua/menu.lua Fri Feb 16 03:12:24 2018 (r329349) @@ -273,9 +273,9 @@ function menu.run(m) local key = io.getchar(); -- Special key behaviors - if (key == 127) and (m ~= menu.welcome) then + if (key == core.KEY_BACKSPACE) and (m ~= menu.welcome) then break - elseif (key == 13) then + elseif (key == core.KEY_ENTER) then core.boot(); -- Should not return end @@ -357,7 +357,7 @@ function menu.autoboot() screen.defcursor(); if io.ischar() then local ch = io.getchar(); - if ch == 13 then + if ch == core.KEY_ENTER then break; else -- prevent autoboot when escaping to interpreter Modified: head/stand/lua/password.lua ============================================================================== --- head/stand/lua/password.lua Fri Feb 16 01:33:01 2018 (r329348) +++ head/stand/lua/password.lua Fri Feb 16 03:12:24 2018 (r329349) @@ -37,11 +37,11 @@ function password.read() repeat ch = io.getchar(); - if ch == 13 then + if ch == core.KEY_ENTER then break; end - if ch == 8 then + if ch == core.KEY_BACKSPACE then if n > 0 then n = n - 1; -- loader.printc("\008 \008");