summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdconfig/console
Commit message (Collapse)AuthorAgeFilesLines
* MFC r259054:dteske2014-01-157-37/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance and debugging enhancements: + Remove UNAME_P=$(...) from startup/misc -- already supplied by common.subr + Use f_getvar instead of $(eval echo \$$var) -- f_getvar is sub-shell free + Add `-e' and `-k var' options to f_eval_catch -- increasing use-cases + Use f_eval_catch to display errors on failure -- reducing duplicated code + Use f_eval_catch when we need output from a command -- improving debugging + Optimize f_isinter of strings.subr for performance -- now sub-shell free + Improve error checking on pidfiles -- using f_eval_catch and f_isinteger + Use $var_to_set arg of f_ifconfig_{inet,netmask} -- eliminate sub-shells + Use f_sprintf instead of $(printf ...) -- consolidate sub-shells + Use $var_to_set arg of f_route_get_default -- eliminate sub-shells + Add f_count to replace $(set -- ...;echo $#) -- eliminate sub-shells + Add f_count_ifs to replace $(IFS=x;set -- ...;echo $#) -- no sub-shells + Replace var="$var${var:+ }..." in loops with var="$var ..." with a follow- up var="${var# }" to trim leading whitespace -- optimize loops + Use $var_to_set arg of f_resolv_conf_nameservers -- eliminate sub-shells + Comments for the f_eval_catch function + Remove a duplicate `local ... desc ...' in f_device_get_all of device.subr + Use $var_to_set arg of f_device_capacity -- eliminate sub-shells + Whitespace fixes in f_dialog_init of dialog.subr + Optimize f_inet_atoi of media/tcpip.subr for performance -- sub-shell free + In several cases, send stderr to /dev/null -- clean up runtime execution + Change f_err of common.subr to go to program stderr not terminal stderr, allowing redirection of output from functions that use f_err + Disable debugging when using f_getvar to get variable argument to f_startup_rcconf_map_expand of startup/rcconf.subr + Use f_replace_all instead of $(echo ... | tr | sed) -- performance + Add a $var_to_set option to f_index_{file,menusel_{command,keyword}} of common.subr -- centralize sub-shells
* MFC r258355,258360,258400-258401,258406-258407,258418,258430,258439,258589-dteske2014-01-152-11/+11
| | | | | | | | | | | | | | | | | 258590,258592,258727-258728,258785, with the following descriptions: Revisions 258400-258401,258406-258407,258590,258727-258728,258785: + Add a new `includes' module (see: bsdconfig includes -h) for exploring the bsdconfig(8) API Remaining revisions: 258592: Sort all the messages.subr files 258355: Fix typo in a comment in networking/device.subr 258360: Whitespace, style, and other changes in networking/device.subr 258418: Quote interface names for good measure in networking/device.subr 258430: Remove an unused line in networking/device.subr 258439: Minor bugfix to f_die() function in common.subr 258589: Minor bugfix to syscons_ttys module
* Introduce centralized [X]dialog(1) exit codes to `dialog.subr' and make-usedteske2013-10-091-1/+1
| | | | | | | | | | throughout the bsdconfig(8) code. While we're here, add an explicit argument to lvalue-seeking invocations of "return" that previously had no argument. Also, consolidate a single instance of double-newline and remove some comments that are no longer required (given increased readability with new exit codes). Approved by: re (glebius)
* Fix typos in the BSD License.dteske2013-07-078-16/+16
|
* Be consistent with other usr.sbin programs w/respect to the copyrightdteske2013-07-078-8/+8
| | | | wording ("All rights reserved."); I had the casing wrong on many instances.
* More whitespace.dteske2013-06-247-7/+7
|
* Fix a regression introduced by r251967, resulting in:dteske2013-06-221-1/+1
| | | | | /usr/libexec/bsdconfig/080.console/console: 136: Syntax error: ";;" unexpected (expecting "fi")
* Perform some code consolidation and add some additional errordteske2013-06-182-13/+15
| | | | checking/reporting. (similar to SVN revisions 251919 and 251928)
* Oops, in SVN r251905 I forgot that f_die takes the return code as the firstdteske2013-06-185-5/+5
| | | | argument (not the format).
* Improve the INDEX format. Whitespace improvements, format improvements, typodteske2013-06-181-17/+21
| | | | and grammatical fixes.
* Remove unnecessary loops, perform some code consolidation, and add somedteske2013-06-187-364/+215
| | | | additional error checking/reporting.
* Whitespace improvements.dteske2013-06-186-95/+91
|
* Don't silently ignore errors (found whiledteske2013-06-081-8/+11
| | | | testing with `chflags schg /etc/ttys).
* Prevent getting hung-up on the following prompt (found while testing withdteske2013-06-081-1/+1
| | | | | | | | `chflags schg /etc/ttys'): override rw-r--r-- root/wheel for /etc/ttys? (y/n [n]) Simply by adding `-f' flag to mv(1).
* Fix a one-character typo. The effects of which were "Console"->"Ttys" menudteske2013-06-081-1/+1
| | | | | | | | | | | | would not launch (and gave no error). This was easily diagnosed by running `bsdconfig -d' as root and seeing the following error right after selecting the "Ttys" sub-menu: DEBUG: f_getvar: var=[text] value=[ Error: Expected at least 6 tokens for --menu, have 4. Use --help to list options.] r=0 Typo was introduced by SVN r251361.
* Reduce verbosity in the "Console"->"Saver" module (bsdconfig syscons_saver)dteske2013-06-081-1/+1
| | | | | | | by replacing the infinitive [verb] phrase "Simply blank the screen" with a simple description of what you get; "Blank screen". PR: ports/169316
* Shift Console->Saver menu items to place the default item at the top, makingdteske2013-06-041-41/+41
| | | | | | | | | | | | | this menu consistent with Console->Repeat, Console->Font, Console->Screenmap and many others which place the default choice at the top. NOTE: SVN r249751 changed things so that these menus highlight the active selection, so the idea that the default choice (now at top) "can be selected immediately by hitting ENTER" is not possible unless the default choice is the currently active setting (e.g., on first visit to the menu). However, it is still warranted to have the default choice at the top of the menu. PR: bin/169316
* Lessen verbosity of "Exit" menutag items to appear more consistent acrossdteske2013-06-041-1/+1
| | | | | | | | menus from one module to the next. Replacing "Exit this menu (returning to previous)" with "Exit this menu". PR: ports/169316
* Comments.dteske2013-06-041-1/+1
|
* Similar to r251236, r251242, and r251244. Introduce new function-pair todteske2013-06-041-19/+21
| | | | | | | | | | | | | | | | | dialog(1) API in dialog.subr responsible for retrieving menu-choice data (for the --menu widget). Add f_dialog_menuitem_store()/f_dialog_menuitem_fetch() for storing and retrieving the menuitem (not the tag) from a --menu widget result. The dialog --menu widget returns the `tag' from the tag/item pair of choices for a menu list. Because the menu list is often local to the function that is displaying it, the ability to dereference this into the item is not possible unless you use a global. This changes things so the function (upon successful return of dialog) dereferences the tag into the item and stores it for later retrieval using these functions. NOTE: Tags are dereferenced into items using f_dialog_menutag2item().
* Standardize the way functions build their arguments leading up to a dialogdteske2013-06-027-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invocation. Specifically, "top-load" your arguments and in the order in- which they will be displayed. For example, many [if not all] widgets display information in the following order, top-to-bottom (visually): + backtitle (displayed behind the widget at top-left) + title (at the top of the `window') + prompt text (just below the title and above whatever widget you choose) + Depending on widget, _one_ of the following: - menu list - radio list - check list - text input box with initial text - [Xdialog(1)] 2x or 3x text input boxes - [dialog(1)] a multi-part form - progress bar - etc. (many more widget choices) + buttons (right below the selected widget) + [dialog(1)] the hline (displayed at bottom of `window') NOTE: Xdialog(1) accepts and silently ignores --hline When building local arguments for your dialog invocation, if the value can't be cleanly loaded into a local, add "# Calculated below" to the end of the local declaration while retaining the block order of argument declarations. Move other local declarations that are not associated with this top-loading the dialog arguments to right-above where they are first-used. Also, standardize on the names of the arguments. For example, always use $prompt (instead of sometimes $msg and sometimes $prompt); use $menu_list or $shell_list or $radio_list for those respective widgets; ad nauseum. While we're doing this, flush-out full arguments for many invocations that were passing NULL strings (making it unapparent if you were staring at this one invocation what argument that NULL string was supposed to represent). Last, while we're in startup/rcconf let's remove the unnecessary use of a GLOBAL (RCCONF_MENU_LIST) for the menu_list.
* Improve the dialog(1) API in dialog.subr by adding f_dialog_default_store()dteske2013-06-021-10/+14
| | | | | | | | | | and f_dialog_default_fetch(). Operating similar to functions introduced by SVN r251236 and r251242, these functions operate as a pair for helping track the default-item data (for the --menu, --checklist, and --radiolist widgets). This replaces the direct usage of a global to store the data with an abstract method for readability and to centralize the code.
* Similar to r251236, improve the portion of dialog(1) API in dialog.subrdteske2013-06-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | responsible for retrieving stored input (for the --inputbox and --password widgets). When we (Ron McDowell and I) developed the first version of bsdconfig, it used temporary files to store responses from dialog(1). That hasn't been true for a very long time, so the need to always execute some clean-up function is long-deprecated. The function that used to perform these clean- up routines for these widgets was f_dialog_inputstr(). We really don't need f_dialog_inputstr() for its originally designed purpose as all dialog invocations no longer require temporary files. Just as in r251236, redesign f_dialog_inputstr() in the following four ways: 1. Rename f_dialog_inputstr() to f_dialog_inputstr_fetch() 2. Introduce the new first-argument of $var_to_set to reduce forking 3. Create a corresponding f_dialog_inputstr_store() to abstract storage 4. Offload the sanitization to a new function, f_dialog_line_sanitize() It should be noted that f_dialog_line_sanitize() -- unlike its cousin from SVN r251236, f_dialog_data_sanitize() -- trims leading/trailing whitespace from the user's input. This helps prevent errors and common mistakes caused by the fact that the new cdialog implementation allows the right-arrow cursor key to go beyond the last byte of realtime input (adding whitespace at the end of the typed value). While we're centralizing the sanitization, let's rewrite f_dialog_input() while we're here to likewise reduce forking. The f_dialog_input() function now expects the first argument of $var_to_set instead of producing results on standard-out. These changes greatly improve readability and also improve performance.
* Improve portion of the dialog(1) API in dialog.subr responsible fordteske2013-06-017-56/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieving stored data (for the --menu, --calendar, --timebox, --checklist, and --radiolist widgets). When we (Ron McDowell and I) developed the first version of bsdconfig, it used temporary files to store responses from dialog(1). That hasn't been true for some very long time, so the need to always store the return status of dialog(1) and then call some function to clean-up is long-deprecated. The function that used to do the clean-up was f_dialog_menutag(). We really don't need f_dialog_menutag() for its originally designed purpose, as all dialog invocations (even when in a sub-shell) do not use temporary files anymore. However, we do need to keep f_dialog_menutag() around because it still fills the need of being able to abstract the procedure for fetching stored data provided by functions that display the aforementioned widgets. In re-designing f_dialog_menutag(), four important changes are made: 1. Rename f_dialog_menutag() to f_dialog_menutag_fetch() 2. Introduce the new first-argument of $var_to_set to reduce number of forks 3. Create a corresponding f_dialog_menutag_store() to abstract the storage 4. Offload the sanitization to a new function, f_dialog_data_sanitize() NOTE: That last one is important. Not all functions need to store their data for later fetching, meanwhile every invocation of dialog should be sanitized (as we learned early-on in the i18n-effort -- underlying libraries will spit warnings to stderr for bad values of $LANG and since dialog outputs its responses to stderr, we need to sanitize every response of these warnings). These changes greatly improve readbaility and also improve performance by reducing unnecessary forking.
* Improve portion of the dialog(1) API in dialog.subr responsible fordteske2013-05-317-56/+69
| | | | | | | | | | | | | | | | | | | | calculating widget sizes. Instead of forking a sub-shell to calculate the optimum size for a widget, use a byRef style call-out to set variables in the parent namespace. For example, instead of: size=$( f_dialog_buttonbox_size title btitle msg ) $DIALOG --title title --backtitle btitle --msgbox msg $size The new API replaces the above with the following: f_dialog_buttonbox_size height width title btitle msg $DIALOG --title title --backtitle btitle --msgbox msg $height $width This reduces the number of forks, improves performance, and makes the code more readable by revealing the argument-order for widget sizing. It also makes performing minor adjustments to the calculated values easier as you no longer have to split-out the response (which required knowledge of ordering so was counter-intuitive).
* Centralize standard getopts arguments, both for convenience and to correctdteske2013-05-147-7/+7
| | | | | | | | | a bug in which certain combinations of arguments produced unexpected results such as `-dX' (now properly produces debugging and X11), `-XS' (now properly produces X11 in secure mode), `-df-' (enables debugging when reading a script from standard-input, etc. Multi-word variations such as `-d -X', `-X -S', `-d -f-', `-d -f -', etc. also work as expected. Also tested were variations in argument order, which are now working as expected.
* UI improvements. First, implement --default-item whenever and whereverdteske2013-04-227-19/+150
| | | | | | | | possible to save keystrokes. Second, overhaul startup/rcdelete for much improved performance. Last, but not least, kill-off useage of --clear and implement --keep-tite in harmony to minimize jarring transitions. Also, fix local variable names where necessary while we're here with other minor comment-enhancements/typo-corrections.
* Add new flags `-d' (sets debug=1) and `-D file' (sets debugFile) anddteske2013-04-228-16/+20
| | | | | | improve debugging initialization. Also fixup USAGE statements while we're here. Also, change initialization of main program to _not_ change working directory, allowing the debugFile to be relative without confusion.
* Don't use f_show_msg() unless printf(1) syntax is required (this reduces thedteske2013-01-141-1/+1
| | | | number of unnecessary forks).
* Add more debugging to help with diagnosis of program-flow when needed.dteske2012-12-257-0/+7
|
* Remove unnecessary duplicate initialization of the dialog(1) API (automaticallydteske2012-12-257-7/+0
| | | | bootstrapped on-include unless DIALOG_SELF_INITIALIZE is set to NO before-hand)
* Add much-needed dialog(1) --inputbox function for simplifying the process ofdteske2012-12-211-26/+3
| | | | requesting input from the user.
* Replicate a feature from sysinstall documented indteske2012-11-167-7/+7
| | | | | | | | | | | | stable/9/usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below): If /usr/sbin/sysinstall is linked to another filename, say `/usr/local/bin/configPackages', then the basename will be used as an implicit command name. To get a list of modules you can link to, see `bsdconfig -h' output. Approved by: adrian (co-mentor) (implicit)
* Reverse SVN r240770 -- jilles@ made a suggestion that allowed us to redesigndteske2012-09-211-2/+2
| | | | | | | our embedded rescue environment to support /dev/null making r240770 obsolete. Reviewed by: jilles, adrian (co-mentor) Approved by: jilles, adrian (co-mentor)
* Replace redirections to /dev/null with "close file-descriptor" syntax (>&-).dteske2012-09-211-2/+2
| | | | | Reviewed by: adrian (co-mentor) Approved by: adrian (co-mentor)
* Change all invocations of dialog(1) to no-longer require temporary files.dteske2012-09-207-16/+53
| | | | | | | This allows bsdconfig to -- like bsdinstall -- operate from read-only media. Reviewed by: adrian (co-mentor) Approved by: adrian (co-mentor)
* Move major includes into /usr/share/bsdconfig for easy external access.dteske2012-09-187-41/+41
| | | | | Reviewed by: adrian (co-mentor) Approved by: adrian (co-mentor)
* Import bsdconfig(8) as a replacement for the post-install abilities ofdteske2012-07-1412-0/+1761
deprecated sysinstall(8). NOTE: WITH_BSDCONFIG is currently required. Submitted by: Devin Teske (dteske), Ron McDowell <rcm@fuzzwad.org> Reviewed by: Ron McDowell <rcm@fuzzwad.org> Approved by: Ed Maste (emaste)
OpenPOWER on IntegriCloud