@@ -1023,7 +1023,7 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char** filepath)

 	/* Success. Add null terminator */

 	fname[linksz] = '\0';

-    *filepath = cli_strndup(fname, strnlen(fname, PATH_MAX));

+    *filepath = cli_strndup(fname, cli_strnlen(fname, PATH_MAX));

 	if (NULL == *filepath) {

 		cli_errmsg("cli_get_filepath_from_filedesc: Failed to allocate memory to store filename\n");

 		status = CL_EMEM;

@@ -1040,7 +1040,7 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char** filepath)

         goto done;

     }

-    *filepath = cli_strndup(fname, strnlen(fname, PATH_MAX));

+    *filepath = cli_strndup(fname, cli_strnlen(fname, PATH_MAX));

 	if (NULL == *filepath) {

 		cli_errmsg("cli_get_filepath_from_filedesc: Failed to allocate memory to store filename\n");

 		status = CL_EMEM;

@@ -1074,6 +1074,13 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char** filepath)

 		goto done;

 	}

+#else

+

+	cli_dbgmsg("cli_get_filepath_from_filedesc: No mechanism implemented to determine filename from file descriptor.\n");

+	*filename = NULL;

+	status = CL_BREAK;

+	goto done;

+

 #endif

 	cli_errmsg("cli_get_filepath_from_filedesc: File path for fd [%d] is: %s\n", desc, *filepath);

@@ -1082,4 +1089,4 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char** filepath)

 done:

     return status;

-}

\ No newline at end of file

+}

@@ -1131,7 +1131,7 @@ cl_error_t cli_basename(const char *filepath, size_t filepath_len, char **fileba

     if ((index != filepath) || (index[0] == PATHSEP[0]))

         index++;

-    if (0 == strnlen(index, filepath_len - (index - filepath))) {

+    if (0 == cli_strnlen(index, filepath_len - (index - filepath))) {

         cli_dbgmsg("cli_basename: Provided path does not include a file name.\n");

         status = CL_EFORMAT;

         goto done;