Simplify the upgrade path handling from PPA.

[deb_libnfs.git] / rquota / rquota.c

diff --git a/rquota/rquota.c b/rquota/rquota.c
index e6a49de4a41be4ebec28d164c8959bd47e7626a4..ec19d6149e299f15bb3a6e6981067d93396bea1d 100644 (file)
--- a/rquota/rquota.c
+++ b/rquota/rquota.c
@@ -14,11 +14,14 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef WIN32
+#include "win32_compat.h"
+#endif/*WIN32*/
 
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <rpc/xdr.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -51,14 +54,14 @@ int rpc_rquota1_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_dat
 {
        struct rpc_pdu *pdu;
 
-       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V1, RQUOTA1_NULL, cb, private_data, (xdrproc_t)xdr_void, 0);
+       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V1, RQUOTA1_NULL, cb, private_data, (zdrproc_t)zdr_void, 0);
        if (pdu == NULL) {
-               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota/null call");
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota1/null call");
                return -1;
        }
 
        if (rpc_queue_pdu(rpc, pdu) != 0) {
-               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota/null call");
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota1/null call");
                rpc_free_pdu(rpc, pdu);
                return -2;
        }
@@ -71,23 +74,132 @@ int rpc_rquota1_getquota_async(struct rpc_context *rpc, rpc_cb cb, char *export,
        struct rpc_pdu *pdu;
        GETQUOTA1args args;
 
-       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V1, RQUOTA1_GETQUOTA, cb, private_data, (xdrproc_t)xdr_GETQUOTA1res, sizeof(GETQUOTA1res));
+       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V1, RQUOTA1_GETQUOTA, cb, private_data, (zdrproc_t)zdr_GETQUOTA1res, sizeof(GETQUOTA1res));
        if (pdu == NULL) {
-               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota/getquota call");
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota1/getquota call");
                return -1;
        }
 
        args.export = export;
        args.uid    = uid;
 
-       if (xdr_GETQUOTA1args(&pdu->xdr, &args) == 0) {
-               rpc_set_error(rpc, "XDR error: Failed to encode GETQUOTA1args");
+       if (zdr_GETQUOTA1args(&pdu->zdr, &args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode GETQUOTA1args");
                rpc_free_pdu(rpc, pdu);
                return -2;
        }
 
        if (rpc_queue_pdu(rpc, pdu) != 0) {
-               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota/getquota call");
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota1/getquota call");
+               rpc_free_pdu(rpc, pdu);
+               return -3;
+       }
+
+       return 0;
+}
+
+int rpc_rquota1_getactivequota_async(struct rpc_context *rpc, rpc_cb cb, char *export, int uid, void *private_data)
+{
+       struct rpc_pdu *pdu;
+       GETQUOTA1args args;
+
+       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V1, RQUOTA1_GETACTIVEQUOTA, cb, private_data, (zdrproc_t)zdr_GETQUOTA1res, sizeof(GETQUOTA1res));
+       if (pdu == NULL) {
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota1/getactivequota call");
+               return -1;
+       }
+
+       args.export = export;
+       args.uid    = uid;
+
+       if (zdr_GETQUOTA1args(&pdu->zdr, &args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode GETQUOTA1args");
+               rpc_free_pdu(rpc, pdu);
+               return -2;
+       }
+
+       if (rpc_queue_pdu(rpc, pdu) != 0) {
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota1/getactivequota call");
+               rpc_free_pdu(rpc, pdu);
+               return -3;
+       }
+
+       return 0;
+}
+
+
+int rpc_rquota2_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_data)
+{
+       struct rpc_pdu *pdu;
+
+       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V2, RQUOTA2_NULL, cb, private_data, (zdrproc_t)zdr_void, 0);
+       if (pdu == NULL) {
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota2/null call");
+               return -1;
+       }
+
+       if (rpc_queue_pdu(rpc, pdu) != 0) {
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota2/null call");
+               rpc_free_pdu(rpc, pdu);
+               return -2;
+       }
+
+       return 0;
+}
+
+int rpc_rquota2_getquota_async(struct rpc_context *rpc, rpc_cb cb, char *export, int type, int uid, void *private_data)
+{
+       struct rpc_pdu *pdu;
+       GETQUOTA2args args;
+
+       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V2, RQUOTA2_GETQUOTA, cb, private_data, (zdrproc_t)zdr_GETQUOTA1res, sizeof(GETQUOTA1res));
+       if (pdu == NULL) {
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota2/getquota call");
+               return -1;
+       }
+
+       args.export  = export;
+       args.type    = type;
+       args.uid     = uid;
+
+       if (zdr_GETQUOTA2args(&pdu->zdr, &args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode GETQUOTA2args");
+               rpc_free_pdu(rpc, pdu);
+               return -2;
+       }
+
+       if (rpc_queue_pdu(rpc, pdu) != 0) {
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota2/getquota call");
+               rpc_free_pdu(rpc, pdu);
+               return -3;
+       }
+
+       return 0;
+}
+
+int rpc_rquota2_getactivequota_async(struct rpc_context *rpc, rpc_cb cb, char *export, int type, int uid, void *private_data)
+{
+       struct rpc_pdu *pdu;
+       GETQUOTA2args args;
+
+       pdu = rpc_allocate_pdu(rpc, RQUOTA_PROGRAM, RQUOTA_V2, RQUOTA2_GETACTIVEQUOTA, cb, private_data, (zdrproc_t)zdr_GETQUOTA1res, sizeof(GETQUOTA1res));
+       if (pdu == NULL) {
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for rquota2/getactivequota call");
+               return -1;
+       }
+
+       args.export  = export;
+       args.type    = type;
+       args.uid     = uid;
+
+       if (zdr_GETQUOTA2args(&pdu->zdr, &args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode GETQUOTA2args");
+               rpc_free_pdu(rpc, pdu);
+               return -2;
+       }
+
+       if (rpc_queue_pdu(rpc, pdu) != 0) {
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for rquota2/getactivequota call");
                rpc_free_pdu(rpc, pdu);
                return -3;
        }