Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin Bye bye sushi (moved via repository copy to othersrc)
details: https://anonhg.NetBSD.org/src/rev/27affc92e5e7
branches: trunk
changeset: 588101:27affc92e5e7
user: christos <christos%NetBSD.org@localhost>
date: Wed Feb 08 00:46:13 2006 +0000
description:
Bye bye sushi (moved via repository copy to othersrc)
diffstat:
usr.sbin/Makefile | 4 +-
usr.sbin/sushi/C.msg | 73 -
usr.sbin/sushi/Makefile | 20 -
usr.sbin/sushi/TODO | 18 -
usr.sbin/sushi/blabel.c | 262 ------
usr.sbin/sushi/blabel.h | 45 -
usr.sbin/sushi/formtree.h | 97 --
usr.sbin/sushi/functions.c | 378 --------
usr.sbin/sushi/functions.h | 56 -
usr.sbin/sushi/handlers.c | 278 ------
usr.sbin/sushi/handlers.h | 58 -
usr.sbin/sushi/menutree.c | 139 ---
usr.sbin/sushi/menutree.h | 64 -
usr.sbin/sushi/run.c | 580 -------------
usr.sbin/sushi/run.h | 43 -
usr.sbin/sushi/scandir.c | 148 ---
usr.sbin/sushi/scandir.h | 46 -
usr.sbin/sushi/scanform.c | 1864 --------------------------------------------
usr.sbin/sushi/scanform.h | 60 -
usr.sbin/sushi/sushi.8 | 180 ----
usr.sbin/sushi/sushi.c | 398 ---------
usr.sbin/sushi/sushi.h | 45 -
22 files changed, 2 insertions(+), 4854 deletions(-)
diffs (truncated from 4954 to 300 lines):
diff -r e4c1a6e1939e -r 27affc92e5e7 usr.sbin/Makefile
--- a/usr.sbin/Makefile Wed Feb 08 00:32:06 2006 +0000
+++ b/usr.sbin/Makefile Wed Feb 08 00:46:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.209 2005/12/06 11:55:19 skrll Exp $
+# $NetBSD: Makefile,v 1.210 2006/02/08 00:46:13 christos Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -18,7 +18,7 @@
repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
rpc.statd rpcbind rwhod sa screenblank sesd \
sliplogin slstats sntp \
- spray sti sunlabel sup sushi syslogd tadpolectl tcpdchk \
+ spray sti sunlabel sup syslogd tadpolectl tcpdchk \
tcpdmatch tcpdump timed tpctl traceroute trpt trsp unlink \
usbdevs user videomode vipw vnconfig wiconfig wlanctl wpa \
wsconscfg wsfontload wsmoused wsmuxctl zdump zic
diff -r e4c1a6e1939e -r 27affc92e5e7 usr.sbin/sushi/C.msg
--- a/usr.sbin/sushi/C.msg Wed Feb 08 00:32:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-$set 1 errors
-1 log_do arguments must be on or off
-2 script_do arguments must be on or off
-3 ftp_start failed
-4 nlist failed
-5 function not found
-6 empty endpoint
-7 poll failed but no child died
-8 failed to allocate status window
-9 failed to allocate status box
-10 failed to allocate output window
-11 invalid data type
-12 description too long
-13 no files
-14 invalid field type
-15 error return from new form
-16 cannot allocate scroll widget
-17 poll failure
-18 can't stat
-19 No menu hierarchy found.
-20 Bad keybinding
-21 Bad keyword in config file
-22 Null filename in escript argument
-23 Quickname not found in any menus
-$set 2 labels
-1 F1=Help
-2 F2=Refresh
-3 F3=Cancel
-4 F4=List
-5 F5=Reset
-6 F6=Command
-7 F7=Edit
-8 F8=Image
-9 F9=Shell
-10 F10=Exit
-11 </5><OK><!5>
-12 Help
-13 Script:
-14 Log:
-15 ON
-16 OFF
-$set 3 run.c stuff
-1 executing
-2 Status
-3 Running
-4 Command
-5 Lines
-6 Failed
-7 Finished
-8 Press any key to continue
-9 Use HOME,END,PGUP,PDGN,UP/DOWN Arrow keys to scroll ESC, F3 exits, F10 quits.
-10 The current field is a list field, and selections can only be made from
-11 the pre-defined list. Please use TAB or the List(F4) command to edit.
-12 Press the ENTER key to return from the list popup.
-13 The current field is a multiple-selection list field. The field can only
-14 be edited by issueing the List(F4) command, and toggling desired options
-15 with the spacebar. Press the ENTER key to return from the list popup.
-16 No help is available for this screen.
-17 Are you sure? (Y/n)
-18 The data entered in this field is invalid.
-19 Please enter the correct information before continuing.
-$set 4 menu titles and stuff
-1 Select choice
-2 Generating form data, please wait
-3 Log started at
-4 Script started at
-5 <C></5>Sushi\n\n
-6 Enter the field data below, and hit enter to return to the form.
-7 Data Entry:
-8 Form Page:
-9 PGUP/PGDN to change page, UP/DOWN switch field, ENTER submit.
-10 Log ended at
-11 Script ended at
diff -r e4c1a6e1939e -r 27affc92e5e7 usr.sbin/sushi/Makefile
--- a/usr.sbin/sushi/Makefile Wed Feb 08 00:32:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2002/09/19 12:08:38 lukem Exp $
-# @(#)Makefile 8.1 (Berkeley) 5/31/93
-
-.include <bsd.own.mk>
-
-PROG= sushi
-SRCS= sushi.c scandir.c menutree.c scanform.c run.c functions.c \
- handlers.c blabel.c
-
-MAN= sushi.8
-
-LIBINSTALL != cd ${NETBSDSRCDIR}/usr.sbin/pkg_install/lib && ${PRINTOBJDIR}
-
-LDADD+= -lutil -lcdk -lform -lcurses -lm -L${LIBINSTALL} -linstall
-DPADD+= ${LIBUTIL} ${LIBCDK} ${LIBFORM} ${LIBCURSES} ${LIBM} \
- ${LIBINSTALL}/libinstall.a
-
-NLS= C.msg
-
-.include <bsd.prog.mk>
diff -r e4c1a6e1939e -r 27affc92e5e7 usr.sbin/sushi/TODO
--- a/usr.sbin/sushi/TODO Wed Feb 08 00:32:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-? abort key for run
- Make F6 work
- commmandline switches for log/script
- F8 label: Image -> Screenshot
-----
-Menu ideas:
-
-/etc/ttys
-/etc/fstab
-/etc/ntp.conf
-setup amd
-hosts.{deny,allow}
-bulk pkgadd
-/etc/ftpusers
-
-BUGS:
-required fields, aren't.
-All of the /etc/*.conf menus need to be updated prior to release.
diff -r e4c1a6e1939e -r 27affc92e5e7 usr.sbin/sushi/blabel.c
--- a/usr.sbin/sushi/blabel.c Wed Feb 08 00:32:06 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-/* $NetBSD: blabel.c,v 1.11 2005/01/12 17:38:40 peter Exp $ */
-
-/*
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Copyright (c) 2000 Tim Rightnour <garbled%NetBSD.org@localhost>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/ioctl.h>
-
-#include <limits.h>
-#include <curses.h>
-#include <cdk/cdk.h>
-
-#include "sushi.h"
-#include "handlers.h"
-#include "blabel.h"
-
-extern nl_catd catalog;
-extern struct winsize ws;
-extern char *lang_id;
-extern CDKSCREEN *cdkscreen;
-extern char **searchpaths;
-extern char *keylabel[10];
-extern chtype keybinding[10];
-extern int scripting;
-extern int logging;
-
-WINDOW *labelwin;
-
-#define BLABEL_WIDTH 13
-#define BLABEL_SIZE 12
-
-/*
- * if type = 1, only show basic form.
- * if type = 2, show additional for form manipulation.
- */
-void
-bottom_help(int type)
-{
- char *label[BLABEL_SIZE];
- int i, j;
-
- label[0] = catgets(catalog, 2, 1, "F1=Help");
- label[1] = catgets(catalog, 2, 2, "F2=Refresh");
- label[2] = catgets(catalog, 2, 3, "F3=Cancel");
- label[3] = catgets(catalog, 2, 4, "F4=List");
- label[4] = catgets(catalog, 2, 5, "F5=Reset");
- label[5] = catgets(catalog, 2, 6, "F6=Command");
- label[6] = catgets(catalog, 2, 7, "F7=Edit");
- label[7] = catgets(catalog, 2, 8, "F8=Image");
- label[8] = catgets(catalog, 2, 9, "F9=Shell");
- label[9] = catgets(catalog, 2, 10, "F10=Exit");
- label[10]= catgets(catalog, 2, 13, "Script:");
- label[11]= catgets(catalog, 2, 14, "Log:");
-
- /* check for key overrides from the config file */
- for (i = 0; i < 10; i++)
- if (keybinding[i] != 0)
- label[i] = strdup(keylabel[i]);
-
- labelwin = subwin(stdscr, 2, ws.ws_col, ws.ws_row - 2, 0);
- if (labelwin == NULL)
- bailout("%s", catgets(catalog, 1, 23,
- "failed to allocate bottomhelp window"));
- wattron(labelwin, A_BOLD);
-
- for (i = 0, j = 0; i < BLABEL_SIZE; i += 2, j += BLABEL_WIDTH)
- if (i < 3 || i > 6 || type == 2) {
- mvwaddstr(labelwin, 0, j, label[i]);
- }
- for (i = 1, j = 0; i < BLABEL_SIZE; i += 2, j += BLABEL_WIDTH)
- if (i < 3 || i > 6 || type == 2) {
- mvwaddstr(labelwin, 1, j, label[i]);
- }
-
- if (scripting)
- mvwaddstr(labelwin, 0, ws.ws_col - 4,
- catgets(catalog, 2, 15, "ON "));
- else
- mvwaddstr(labelwin, 0, ws.ws_col - 4,
- catgets(catalog, 2, 16, "OFF"));
-
- if (logging)
- mvwaddstr(labelwin, 1, ws.ws_col - 4,
- catgets(catalog, 2, 15, "ON "));
- else
- mvwaddstr(labelwin, 1, ws.ws_col - 4,
- catgets(catalog, 2, 16, "OFF"));
-
- wrefresh(labelwin);
- wattroff(labelwin, A_BOLD);
-}
-
-/*ARGSUSED*/
-static void
-wrap_help(EObjectType cdktype, void *object, void *clientdata, chtype key)
-{
- char *p;
- int rc, i;
-
- if (strcmp((char *)clientdata, "sushi_topmenu") == 0) {
- for (i = 0, rc = -2, p = searchpaths[i]; p != NULL && rc == -2;
- i++) {
- p = searchpaths[i];
- rc = simple_lang_handler(p, HELPFILE, handle_help);
- }
- if (rc != -2) {
- eraseCDKScreen(cdkscreen);
- refreshCDKScreen(cdkscreen);
- return;
- }
- } else {
- rc = simple_lang_handler((char *)clientdata, HELPFILE,
- handle_help);
- if (rc != -2) {
- eraseCDKScreen(cdkscreen);
- refreshCDKScreen(cdkscreen);
- return;
- }
- }
- nohelp();
-}
-
-/*ARGSUSED*/
-static void
Home |
Main Index |
Thread Index |
Old Index