X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/6f04f47c8f973a5c8ab3647e62dc19979d3ec1ba..98a1d50bd9c33b6cc9f281617400374e306378f7:/key.c

diff --git a/key.c b/key.c
index 50c5321..0709c6e 100644
--- a/key.c
+++ b/key.c
@@ -1331,27 +1331,21 @@ end:
   return (0);
 }
 
-static PyObject *kmeth_extract(PyObject *me, PyObject *arg, PyObject *kw)
+static PyObject *kmeth_extractline(PyObject *me, PyObject *arg, PyObject *kw)
 {
   key_filter f = { 0, 0 };
-  PyObject *file;
-  PyObject *nameobj;
-  char *name;
-  FILE *fp;
-  static const char *const kwlist[] = { "file", "filter", 0 };
-
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O&:extract", KWLIST,
-				   &PyFile_Type, &file,
-				   convfilter, &f) ||
-      (fp = PyFile_AsFile(file)) == 0 ||
-      (nameobj = PyFile_Name(file)) == 0 ||
-      (name = TEXT_STR(nameobj)) == 0)
+  dstr d = DSTR_INIT;
+  PyObject *rc = 0;
+  static const char *const kwlist[] = { "filter", 0 };
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:extract", KWLIST,
+				   convfilter, &f))
     goto end;
-  if (key_extract(KEY_KF(me), KEY_K(me), fp, &f))
-    OSERR(name);
-  RETURN_ME;
+  key_extractline(KEY_KF(me), KEY_K(me), &d, &f);
+  rc = TEXT_FROMSTRLEN(d.buf, d.len);
 end:
-  return (0);
+  dstr_destroy(&d);
+  return (rc);
 }
 
 static PyObject *kmeth_fingerprint(PyObject *me,
@@ -1489,7 +1483,7 @@ static const PyMethodDef key_pymethods[] = {
   NAMETH(delete,	"KEY.delete()")
   NAMETH(expire,	"KEY.expire()")
   METH	(used,		"KEY.used(TIME)")
-  KWMETH(extract,	"KEY.extract(FILE, [filter = <any>])")
+  KWMETH(extractline,	"KEY.extractline([filter = <any>])")
   KWMETH(fingerprint,	"KEY.fingerprint(HASH, [filter = '-secret'])")
 #undef METHNAME
   { 0 }
@@ -1686,27 +1680,20 @@ end:
   return (0);
 }
 
-static PyObject *kfmeth_merge(PyObject *me, PyObject *arg, PyObject *kw)
+static PyObject *kfmeth_mergeline(PyObject *me, PyObject *arg, PyObject *kw)
 {
   struct reportinfo ri = { Py_None, 0 };
-  char *name;
-  PyObject *x = 0;
-  FILE *fp = 0;
-  int rc;
-  static const char *const kwlist[] = { "file", "report", 0 };
+  const char *file, *line;
+  int lno, rc;
+  static const char *const kwlist[] = { "name", "lno", "line", "report", 0 };
 
   Py_XINCREF(arg); Py_XINCREF(kw);
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O:merge", KWLIST,
-				   &PyFile_Type, &x, &ri.func))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "sis|O:merge", KWLIST,
+				   &file, &lno, &line, &ri.func))
     goto end;
   if (ri.func != Py_None && !PyCallable_Check(ri.func))
     TYERR("reporter function not callable");
-  if ((fp = PyFile_AsFile(x)) == 0)
-    goto end;
-  x = PyFile_Name(x);
-  if ((name = TEXT_STR(x)) == 0)
-    goto end;
-  rc = key_merge(KEYFILE_KF(me), name, fp, pythonreporter, &ri);
+  rc = key_mergeline(KEYFILE_KF(me), file, lno, line, pythonreporter, &ri);
   if (ri.stop)
     goto end;
   if (rc != 0)
@@ -1817,7 +1804,8 @@ static PyObject *kfget_filep(PyObject *me, void *hunoz)
 static const PyMethodDef keyfile_pymethods[] = {
 #define METHNAME(func) kfmeth_##func
   NAMETH(save,		"KF.save()")
-  KWMETH(merge,		"KF.merge(FILE, [report = <built-in-reporter>])")
+  KWMETH(mergeline,	"KF.mergeline(NAME, LNO, LINE, "
+					   "[report = <built-in-reporter>])")
   KWMETH(newkey,	"KF.newkey(ID, TYPE, [exptime = KEXP_FOREVER]) "
 								    "-> KEY")
   METH	(byid,		"KF.byid(KEYID) -> KEY|None")