Print this page
OS-3280 need a way to specify the root of a native system in the lx brand
OS-3279 lx brand should allow delegated datasets
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/ptools/pwdx/pwdx.c
+++ new/usr/src/cmd/ptools/pwdx/pwdx.c
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License, Version 1.0 only
6 6 * (the "License"). You may not use this file except in compliance
7 7 * with the License.
8 8 *
9 9 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 * or http://www.opensolaris.org/os/licensing.
11 11 * See the License for the specific language governing permissions
12 12 * and limitations under the License.
13 13 *
14 14 * When distributing Covered Code, include this CDDL HEADER in each
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
15 15 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16 16 * If applicable, add the following below this CDDL HEADER, with the
17 17 * fields enclosed by brackets "[]" replaced with your own identifying
18 18 * information: Portions Copyright [yyyy] [name of copyright owner]
19 19 *
20 20 * CDDL HEADER END
21 21 */
22 22 /*
23 23 * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
24 24 * Use is subject to license terms.
25 + * Copyright (c) 2014, Joyent, Inc. All rights reserved.
25 26 */
26 27
27 -#pragma ident "%Z%%M% %I% %E% SMI"
28 -
29 28 #include <stdio.h>
30 29 #include <unistd.h>
31 30 #include <string.h>
32 31 #include <errno.h>
33 32 #include <libproc.h>
34 33 #include <sys/param.h>
35 34
35 +#include "ptools_common.h"
36 +
36 37 static char *command;
37 38
38 39 static int
39 40 show_cwd(const char *arg)
40 41 {
41 42 char cwd[MAXPATHLEN], proc[128];
42 43 psinfo_t p;
43 44 int gcode;
44 45 int ret;
45 46
46 47 if (proc_arg_psinfo(arg, PR_ARG_PIDS, &p, &gcode) == -1) {
47 48 (void) fprintf(stderr, "%s: cannot examine %s: %s\n",
48 49 command, arg, Pgrab_error(gcode));
49 50 return (1);
50 51 }
51 52
52 - (void) snprintf(proc, sizeof (proc), "/proc/%d/path/cwd",
53 + (void) proc_snprintf(proc, sizeof (proc), "/proc/%d/path/cwd",
53 54 (int)p.pr_pid);
54 55
55 56 if ((ret = readlink(proc, cwd, sizeof (cwd) - 1)) <= 0) {
56 57 (void) fprintf(stderr, "%s: cannot resolve cwd for %s: %s\n",
57 58 command, arg, strerror(errno));
58 59 return (1);
59 60 }
60 61
61 62 cwd[ret] = '\0';
62 63
63 64 (void) printf("%d:\t%s\n", (int)p.pr_pid, cwd);
64 65 return (0);
65 66 }
66 67
67 68 int
68 69 main(int argc, char **argv)
69 70 {
70 71 int retc = 0;
71 72
72 73 if ((command = strrchr(argv[0], '/')) != NULL)
73 74 command++;
74 75 else
75 76 command = argv[0];
76 77
77 78 if (argc <= 1) {
78 79 (void) fprintf(stderr, "usage:\t%s pid ...\n", command);
79 80 (void) fprintf(stderr, " (show process working directory)\n");
80 81 }
81 82
82 83 while (--argc >= 1)
83 84 retc += show_cwd(*++argv);
84 85
85 86 return (retc);
86 87 }
|
↓ open down ↓ |
24 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX