Deleted Added
sdiff udiff text old ( 122556 ) new ( 125011 )
full compact
list.c (122556) list.c (125011)
1
2/*
3 * list.c
4 *
5 * Copyright (c) 1996-1999 Whistle Communications, Inc.
6 * All rights reserved.
7 *
8 * Subject to the following obligations and disclaimer of warranty, use and

--- 20 unchanged lines hidden (view full) ---

29 * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
30 * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
31 * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
35 * OF SUCH DAMAGE.
36 *
1
2/*
3 * list.c
4 *
5 * Copyright (c) 1996-1999 Whistle Communications, Inc.
6 * All rights reserved.
7 *
8 * Subject to the following obligations and disclaimer of warranty, use and

--- 20 unchanged lines hidden (view full) ---

29 * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
30 * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
31 * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
32 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34 * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
35 * OF SUCH DAMAGE.
36 *
37 * $FreeBSD: head/usr.sbin/ngctl/list.c 122556 2003-11-12 13:04:44Z harti $
37 * $FreeBSD: head/usr.sbin/ngctl/list.c 125011 2004-01-26 10:27:18Z ru $
38 */
39
40#include "ngctl.h"
41
42static int ListCmd(int ac, char **av);
43
44const struct ngcmd list_cmd = {
45 ListCmd,

--- 7 unchanged lines hidden (view full) ---

53
54static int
55ListCmd(int ac, char **av)
56{
57 u_char rbuf[16 * 1024];
58 struct ng_mesg *const resp = (struct ng_mesg *) rbuf;
59 struct namelist *const nlist = (struct namelist *) resp->data;
60 int named_only = 0;
38 */
39
40#include "ngctl.h"
41
42static int ListCmd(int ac, char **av);
43
44const struct ngcmd list_cmd = {
45 ListCmd,

--- 7 unchanged lines hidden (view full) ---

53
54static int
55ListCmd(int ac, char **av)
56{
57 u_char rbuf[16 * 1024];
58 struct ng_mesg *const resp = (struct ng_mesg *) rbuf;
59 struct namelist *const nlist = (struct namelist *) resp->data;
60 int named_only = 0;
61 int k, ch, rtn = CMDRTN_OK;
61 int ch, rtn = CMDRTN_OK;
62 u_int k;
62
63 /* Get options */
64 optind = 1;
65 while ((ch = getopt(ac, av, "n")) != EOF) {
66 switch (ch) {
67 case 'n':
68 named_only = 1;
69 break;

--- 25 unchanged lines hidden (view full) ---

95 return(CMDRTN_ERROR);
96 }
97
98 /* Show each node */
99 printf("There are %d total %snodes:\n",
100 nlist->numnames, named_only ? "named " : "");
101 for (k = 0; k < nlist->numnames; k++) {
102 char path[NG_PATHSIZ];
63
64 /* Get options */
65 optind = 1;
66 while ((ch = getopt(ac, av, "n")) != EOF) {
67 switch (ch) {
68 case 'n':
69 named_only = 1;
70 break;

--- 25 unchanged lines hidden (view full) ---

96 return(CMDRTN_ERROR);
97 }
98
99 /* Show each node */
100 printf("There are %d total %snodes:\n",
101 nlist->numnames, named_only ? "named " : "");
102 for (k = 0; k < nlist->numnames; k++) {
103 char path[NG_PATHSIZ];
103 char *av[3] = { "list", "-n", path };
104 char *argv[3] = { "list", "-n", path };
104
105 snprintf(path, sizeof(path),
106 "[%lx]:", (u_long) nlist->nodeinfo[k].id);
105
106 snprintf(path, sizeof(path),
107 "[%lx]:", (u_long) nlist->nodeinfo[k].id);
107 if ((rtn = (*show_cmd.func)(3, av)) != CMDRTN_OK)
108 if ((rtn = (*show_cmd.func)(3, argv)) != CMDRTN_OK)
108 break;
109 }
110
111 /* Done */
112 return (rtn);
113}
114
109 break;
110 }
111
112 /* Done */
113 return (rtn);
114}
115