From d0f1a803fc48ac2b0da65ca298c5464f34ceea45 Mon Sep 17 00:00:00 2001
From: Leif Walsh <leif@twosigma.com>
Date: Fri, 11 Oct 2024 22:35:53 +0000
Subject: [PATCH] factor erange handling into its own function

---
 src/handlers.rs | 104 ++++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/handlers.rs b/src/handlers.rs
index 17ea555..20ed5c2 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -47,6 +47,20 @@ use nixish::{Netgroup, Service};
 
 const ERANGE: i32 = 34;
 
+fn call_with_erange_handling<F>(buf: &mut Vec<c_char>, mut f: F) -> i32
+where
+    F: FnMut(&mut Vec<c_char>) -> i32,
+{
+    loop {
+        let ret = f(buf);
+        if ret == ERANGE {
+            buf.resize(buf.len() * 2, 0 as c_char);
+        } else {
+            return ret;
+        }
+    }
+}
+
 // these functions are not available in the nix::libc crate
 extern "C" {
     fn setnetgrent(netgroup: *const c_char) -> i32;
@@ -137,31 +151,26 @@ impl ServiceWithName {
         let mut buffer: Vec<c_char> = vec![0; 1024];
         let mut result: *mut servent = ptr::null_mut();
 
-        loop {
-            let ret = unsafe {
-                getservbyname_r(
-                    service_name.as_ptr(),
-                    proto.as_ref().map_or(ptr::null(), |p| p.as_ptr()),
-                    &mut result_buf,
-                    buffer.as_mut_ptr(),
-                    buffer.len(),
-                    &mut result,
-                )
-            };
-            // lookup was successful
-            if ret == 0 {
-                if !result.is_null() {
-                    let service: Service = unsafe { *result }.try_into()?;
-                    return Ok(Some(service));
-                } else {
-                    return Ok(None);
-                };
-            } else if ret == ERANGE {
-                buffer.resize(buffer.len() * 2, 0 as c_char);
-                continue;
+        let ret = call_with_erange_handling(&mut buffer, |buffer| unsafe {
+            getservbyname_r(
+                service_name.as_ptr(),
+                proto.as_ref().map_or(ptr::null(), |p| p.as_ptr()),
+                &mut result_buf,
+                buffer.as_mut_ptr(),
+                buffer.len(),
+                &mut result,
+            )
+        });
+        // lookup was successful
+        if ret == 0 {
+            if !result.is_null() {
+                let service: Service = unsafe { *result }.try_into()?;
+                Ok(Some(service))
             } else {
-                anyhow::bail!("Error: getservbyname_r failed with code {}", ret);
+                Ok(None)
             }
+        } else {
+            anyhow::bail!("Error: getservbyname_r failed with code {}", ret);
         }
     }
 }
@@ -200,30 +209,25 @@ impl ServiceWithPort {
         let mut buffer: Vec<c_char> = vec![0; 1024];
         let mut result: *mut servent = ptr::null_mut();
 
-        loop {
-            let ret = unsafe {
-                getservbyport_r(
-                    self.port as c_int,
-                    proto.as_ref().map_or(ptr::null(), |p| p.as_ptr()),
-                    &mut result_buf,
-                    buffer.as_mut_ptr(),
-                    buffer.len(),
-                    &mut result,
-                )
-            };
-            if ret == 0 {
-                if !result.is_null() {
-                    let service: Service = unsafe { *result }.try_into()?;
-                    return Ok(Some(service));
-                } else {
-                    return Ok(None);
-                };
-            } else if ret == ERANGE {
-                buffer.resize(buffer.len() * 2, 0 as c_char);
-                continue;
+        let ret = call_with_erange_handling(&mut buffer, |buffer| unsafe {
+            getservbyport_r(
+                self.port as c_int,
+                proto.as_ref().map_or(ptr::null(), |p| p.as_ptr()),
+                &mut result_buf,
+                buffer.as_mut_ptr(),
+                buffer.len(),
+                &mut result,
+            )
+        });
+        if ret == 0 {
+            if !result.is_null() {
+                let service: Service = unsafe { *result }.try_into()?;
+                Ok(Some(service))
             } else {
-                anyhow::bail!("Error: getservbyport_r failed with code {}", ret);
+                Ok(None)
             }
+        } else {
+            anyhow::bail!("Error: getservbyport_r failed with code {}", ret);
         }
     }
 }
@@ -343,7 +347,7 @@ impl NetgroupWithName {
         let mut domain: *mut c_char = std::ptr::null_mut();
 
         loop {
-            let ret = unsafe {
+            let ret = call_with_erange_handling(&mut buffer, |buffer| unsafe {
                 getnetgrent_r(
                     &mut host,
                     &mut user,
@@ -351,8 +355,7 @@ impl NetgroupWithName {
                     buffer.as_mut_ptr(),
                     buffer.len() as size_t,
                 )
-            };
-
+            });
             if ret == 1 {
                 let host_str = if !host.is_null() {
                     Some(unsafe { CStr::from_ptr(host) }.to_owned())
@@ -380,11 +383,6 @@ impl NetgroupWithName {
             } else if ret == 0 {
                 unsafe { endnetgrent() };
                 break;
-            } else if ret == ERANGE {
-                //TODO - include error number libs
-                // Double the buffer size and retry
-                buffer.resize(buffer.len() * 2, 0 as c_char);
-                continue;
             } else {
                 // Handle other errors
                 anyhow::bail!("Error: getnetgrent_r failed with code {}", ret);