aboutsummaryrefslogtreecommitdiffstats
path: root/sm/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'sm/server.c')
-rw-r--r--sm/server.c33
1 files changed, 1 insertions, 32 deletions
diff --git a/sm/server.c b/sm/server.c
index e21c6a4f5..a43ff3472 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -30,6 +30,7 @@
#include "gpgsm.h"
#include <assuan.h>
#include "sysutils.h"
+#include "server-help.h"
#define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
@@ -95,38 +96,6 @@ strcpy_escaped_plus (char *d, const char *s)
}
-/* Skip over options.
- Blanks after the options are also removed. */
-static char *
-skip_options (const char *line)
-{
- while (spacep (line))
- line++;
- while ( *line == '-' && line[1] == '-' )
- {
- while (*line && !spacep (line))
- line++;
- while (spacep (line))
- line++;
- }
- return (char*)line;
-}
-
-
-/* Check whether the option NAME appears in LINE */
-static int
-has_option (const char *line, const char *name)
-{
- const char *s;
- int n = strlen (name);
-
- s = strstr (line, name);
- if (s && s >= skip_options (line))
- return 0;
- return (s && (s == line || spacep (s-1)) && (!s[n] || spacep (s+n)));
-}
-
-
/* A write handler used by es_fopencookie to write assuan data
lines. */
static gpgrt_ssize_t