From: Jim Meyering <meyering@redhat.com>
Date: Tue, 11 Aug 2009 15:38:05 +0000 (+0200)
Subject: generator.ml: add type: Dev_or_Path
X-Git-Tag: 1.0.67~17
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=1020246b278aade9671d12dae2554cf7538cf0de;p=libguestfs.git

generator.ml: add type: Dev_or_Path

* src/generator.ml (file, download): Use it.
---

diff --git a/src/generator.ml b/src/generator.ml
index 60e3a02..a745063 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -136,6 +136,7 @@ and argt =
   | String of string	(* const char *name, cannot be NULL *)
   | Device of string	(* /dev device name, cannot be NULL *)
   | Pathname of string	(* file name, cannot be NULL *)
+  | Dev_or_Path of string (* /dev device name or Pathname, cannot be NULL *)
   | OptString of string	(* const char *name, may be NULL *)
   | StringList of string(* list of strings (each string cannot be NULL) *)
   | Bool of string	(* boolean *)
@@ -1477,7 +1478,7 @@ Some internal mounts are not unmounted by this call.");
 This command removes all LVM logical volumes, volume groups
 and physical volumes.");
 
-  ("file", (RString "description", [Pathname "path"]), 49, [],
+  ("file", (RString "description", [Dev_or_Path "path"]), 49, [],
    [InitSquashFS, Always, TestOutput (
       [["file"; "/empty"]], "empty");
     InitSquashFS, Always, TestOutput (
@@ -1801,7 +1802,7 @@ C<filename> can also be a named pipe.
 
 See also C<guestfs_download>.");
 
-  ("download", (RErr, [String "remotefilename"; FileOut "filename"]), 67, [],
+  ("download", (RErr, [Dev_or_Path "remotefilename"; FileOut "filename"]), 67, [],
    [InitBasicFS, Always, TestOutput (
       (* Pick a file from cwd which isn't likely to change. *)
       [["upload"; "../COPYING.LIB"; "/COPYING.LIB"];