X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=83d7086e16fc3d7785d60465af68f7620ce00906;hb=1f1b6cb0a78dcd89299ce22abc96171d1288e074;hp=e539a4559dbb5d03835c25e0415676bc1d0115e9;hpb=2c0f57fa33371a55b798a9cca14a3d58e6b3cb26;p=deb_libnfs.git

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index e539a45..83d7086 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -813,7 +813,7 @@ static void lseek_cb(int status, struct nfs_context *nfs, void *data, void *priv
 	}
 }
 
-int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, int whence, uint64_t *current_offset)
+int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, int64_t offset, int whence, uint64_t *current_offset)
 {
 	struct sync_cb_data cb_data;
 
@@ -1328,7 +1328,7 @@ void free_nfs_srvr_list(struct nfs_server_list *srv)
 		free(srv);
 		srv = next;
 	}
-}	     
+}
 
 struct nfs_list_data {
        int status;
@@ -1364,7 +1364,7 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat
 		srv_data->status = -1;
 		return;
 	}
-	
+
 	/* check for dupes */
 	for (srvr = srv_data->srvrs; srvr; srvr = srvr->next) {
 		if (!strcmp(hostdd, srvr->addr)) {
@@ -1374,7 +1374,7 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat
 
 	srvr = malloc(sizeof(struct nfs_server_list));
 	if (srvr == NULL) {
-		rpc_set_error(rpc, "Malloc failed when allocating server structure");	
+		rpc_set_error(rpc, "Malloc failed when allocating server structure");
 		srv_data->status = -1;
 		return;
 	}
@@ -1399,7 +1399,7 @@ static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceLi
 
   assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-  for(i = 0; i < numIfs; i++) 
+  for(i = 0; i < numIfs; i++)
   {
     SOCKADDR *pAddress;
     char bcdd[16];
@@ -1409,35 +1409,35 @@ static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceLi
 
     if(pAddress->sa_family != AF_INET)
       continue;
-		
+
     nFlags = InterfaceList[i].iiFlags;
 
-    if (!(nFlags & IFF_UP)) 
+    if (!(nFlags & IFF_UP))
     {
       continue;
     }
 
-    if (nFlags & IFF_LOOPBACK) 
+    if (nFlags & IFF_LOOPBACK)
     {
       continue;
     }
 
-    if (!(nFlags & IFF_BROADCAST)) 
+    if (!(nFlags & IFF_BROADCAST))
     {
       continue;
     }
 
-    if (getnameinfo(pAddress, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) 
+    if (getnameinfo(pAddress, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0)
     {
       continue;
     }
 
-    if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) 
+    if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0)
     {
       return -1;
     }
 
-    if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) 
+    if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0)
     {
       return -1;
     }
@@ -1457,34 +1457,34 @@ struct nfs_server_list *nfs_find_local_servers(void)
   int nNumInterfaces = 0;
 
   rpc = rpc_init_udp_context();
-  if (rpc == NULL) 
+  if (rpc == NULL)
   {
     return NULL;
   }
 
-  if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0) 
+  if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0)
   {
     rpc_destroy_context(rpc);
     return NULL;
   }
 
-  if (WSAIoctl(rpc_get_fd(rpc), SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList, sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR) 
+  if (WSAIoctl(rpc_get_fd(rpc), SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList, sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR)
   {
     return NULL;
   }
 
   nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO);
 
-  for (loop=0; loop<3; loop++) 
+  for (loop=0; loop<3; loop++)
   {
-    if (send_nfsd_probes(rpc, InterfaceList, nNumInterfaces, &data) != 0) 
+    if (send_nfsd_probes(rpc, InterfaceList, nNumInterfaces, &data) != 0)
     {
       rpc_destroy_context(rpc);
       return NULL;
     }
 
     win32_gettimeofday(&tv_start, NULL);
-    for(;;) 
+    for(;;)
     {
       int mpt;
 
@@ -1496,18 +1496,18 @@ struct nfs_server_list *nfs_find_local_servers(void)
       -    (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000)
       +    (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000);
 
-      if (poll(&pfd, 1, mpt) < 0) 
+      if (poll(&pfd, 1, mpt) < 0)
       {
         free_nfs_srvr_list(data.srvrs);
         rpc_destroy_context(rpc);
         return NULL;
       }
-      if (pfd.revents == 0) 
+      if (pfd.revents == 0)
       {
         break;
       }
-		
-      if (rpc_service(rpc, pfd.revents) < 0) 
+
+      if (rpc_service(rpc, pfd.revents) < 0)
       {
         break;
       }
@@ -1516,7 +1516,7 @@ struct nfs_server_list *nfs_find_local_servers(void)
 
   rpc_destroy_context(rpc);
 
-  if (data.status != 0) 
+  if (data.status != 0)
   {
     free_nfs_srvr_list(data.srvrs);
     return NULL;
@@ -1607,21 +1607,21 @@ struct nfs_server_list *nfs_find_local_servers(void)
 	while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
 		size *= 2;
 
-		free(ifc.ifc_buf);	
+		free(ifc.ifc_buf);
 		ifc.ifc_len = size;
 		ifc.ifc_buf = malloc(size);
 		memset(ifc.ifc_buf, 0, size);
 		if (ioctl(rpc_get_fd(rpc), SIOCGIFCONF, (caddr_t)&ifc) < 0) {
 			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
+			free(ifc.ifc_buf);
 			return NULL;
 		}
-	}	
+	}
 
 	for (loop=0; loop<3; loop++) {
 		if (send_nfsd_probes(rpc, &ifc, &data) != 0) {
 			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
+			free(ifc.ifc_buf);
 			return NULL;
 		}
 
@@ -1645,14 +1645,14 @@ struct nfs_server_list *nfs_find_local_servers(void)
 			if (pfd.revents == 0) {
 				break;
 			}
-		
+
 			if (rpc_service(rpc, pfd.revents) < 0) {
 				break;
 			}
 		}
 	}
 
-	free(ifc.ifc_buf);	
+	free(ifc.ifc_buf);
 	rpc_destroy_context(rpc);
 
 	if (data.status != 0) {