Page MenuHomeFreeBSD

D40684.diff
No OneTemporary

D40684.diff

diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
--- a/lib/libutil/login_cap.h
+++ b/lib/libutil/login_cap.h
@@ -110,6 +110,8 @@
const char *login_getstyle(login_cap_t *, const char *, const char *);
rlim_t login_getcaptime(login_cap_t *, const char *, rlim_t, rlim_t);
rlim_t login_getcapnum(login_cap_t *, const char *, rlim_t, rlim_t);
+int login_getcapenum(login_cap_t *lc, const char *cap,
+ const char * const *values);
rlim_t login_getcapsize(login_cap_t *, const char *, rlim_t, rlim_t);
const char *login_getpath(login_cap_t *, const char *, const char *);
int login_getcapbool(login_cap_t *, const char *, int);
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -760,6 +760,52 @@
return val;
}
+/*
+ * Extract a string capability expected to hold a specific value from a list.
+ *
+ * 'values' must be a NULL-terminated array of strings listing the possible
+ * values.
+ *
+ * A non-negative return code indicates success, and is the index of the value
+ * in 'values' the capability is set to.
+ *
+ * Negative return codes indicate an error:
+ * -4: 'lc' or 'cap' insufficiently initialized or not valid.
+ * -3: System error (allocation failure).
+ * -2: Capability not found or not a string.
+ * -1: Capability has a string value, but not one listed in 'values'.
+ */
+int
+login_getcapenum(login_cap_t *lc, const char *cap, const char * const *values)
+{
+ int ret, i;
+ char *cand;
+ const char * const *val;
+
+ if (lc == NULL || lc->lc_cap == NULL || cap == NULL || *cap == '\0')
+ return (-4);
+
+ ret = cgetstr(lc->lc_cap, cap, &cand);
+
+ if (ret == -1)
+ /* Cap not found. */
+ return (-2);
+ else if (ret < 0)
+ /* System error (normally, allocation failure). */
+ return (-3);
+
+ ret = -1;
+
+ for (i = 0, val = values; *val != NULL; val++)
+ if (strcmp(cand, *val) == 0) {
+ ret = i;
+ break;
+ }
+
+ free(cand);
+ return (ret);
+}
+
/*

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 18, 5:17 PM (7 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27713133
Default Alt Text
D40684.diff (1 KB)

Event Timeline