public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mattias Ellert <mattias.ellert@physics.uu.se>
To: git-commits@fedoraproject.org
Subject: [rpms/globus-gridftp-server-control] rawhide: Fix compiler warnings
Date: Sun, 14 Jun 2026 08:47:46 GMT [thread overview]
Message-ID: <178142686615.1.5416045076089655443.rpms-globus-gridftp-server-control-e638fc67bff1@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/globus-gridftp-server-control
Branch : rawhide
Commit : e638fc67bff1987680031a1cc73b911d841c64cb
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-06-14T10:39:13+02:00
Stats : +3115/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/globus-gridftp-server-control/c/e638fc67bff1987680031a1cc73b911d841c64cb?branch=rawhide
Log:
Fix compiler warnings
---
diff --git a/0001-Untabify-and-remove-trailing-white-space.patch b/0001-Untabify-and-remove-trailing-white-space.patch
new file mode 100644
index 0000000..0fe917d
--- /dev/null
+++ b/0001-Untabify-and-remove-trailing-white-space.patch
@@ -0,0 +1,3003 @@
+From 3ccdaa0236230bbcbcbf339e7dfdfaf23c10bd6f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 20 May 2026 00:15:37 +0200
+Subject: [PATCH 1/2] Untabify and remove trailing white-space
+
+---
+ .../src/globus_gridftp_server_control.c | 350 +++++++++---------
+ .../globus_gridftp_server_control_commands.c | 314 ++++++++--------
+ .../server-lib/src/globus_xio_gssapi_ftp.c | 136 +++----
+ 3 files changed, 400 insertions(+), 400 deletions(-)
+
+diff --git a/gridftp/server-lib/src/globus_gridftp_server_control.c b/gridftp/server-lib/src/globus_gridftp_server_control.c
+index ccc69e03a..cae415c18 100644
+--- a/gridftp/server-lib/src/globus_gridftp_server_control.c
++++ b/gridftp/server-lib/src/globus_gridftp_server_control.c
+@@ -147,7 +147,7 @@ do \
+ } \
+ } while(0)
+
+-static char * globus_l_gfs_handle_state_name_table[] =
++static char * globus_l_gfs_handle_state_name_table[] =
+ {
+ "GLOBUS_L_GSC_STATE_NONE",
+ "GLOBUS_L_GSC_STATE_OPENING",
+@@ -259,7 +259,7 @@ static void
+ globus_l_gsc_command_callout(
+ void * user_arg);
+
+-static void
++static void
+ globus_l_gsc_free_command_array(
+ char ** cmd_a);
+
+@@ -289,7 +289,7 @@ static globus_xio_driver_t globus_l_gsc_gssapi_ftp_driver;
+ static globus_xio_driver_t globus_l_gsc_telnet_driver;
+ static globus_hashtable_t globus_l_gsc_pwent_cache;
+ static globus_hashtable_t globus_l_gsc_grent_cache;
+-static int globus_l_gsc_max_read_q =
++static int globus_l_gsc_max_read_q =
+ DEFAULT_MAX_Q_LEN;
+
+ GlobusDebugDefine(GLOBUS_GRIDFTP_SERVER_CONTROL);
+@@ -301,7 +301,7 @@ globus_l_gsc_activate()
+ int rc = 0;
+ char * e;
+ globus_result_t res;
+-
++
+ rc = globus_module_activate(GLOBUS_XIO_MODULE);
+ if(rc != 0)
+ {
+@@ -340,7 +340,7 @@ globus_l_gsc_activate()
+ {
+ return GLOBUS_FAILURE;
+ }
+-
++
+ if((e = getenv("GFS_MAX_READ_QUEUE")) != NULL)
+ {
+ globus_l_gsc_max_read_q = atoi(e);
+@@ -349,14 +349,14 @@ globus_l_gsc_activate()
+ globus_l_gsc_max_read_q = DEFAULT_MAX_Q_LEN;
+ }
+ }
+-
++
+ GlobusLTestSuiteMsg();
+ GlobusDebugInit(GLOBUS_GRIDFTP_SERVER_CONTROL,
+ ERROR WARNING TRACE INTERNAL_TRACE COMMANDS VERBOSE STATE);
+
+ /* add all the default command handlers */
+ globus_gridftp_server_control_attr_init(&globus_l_gsc_default_attr);
+-
++
+ globus_hashtable_init(
+ &globus_l_gsc_pwent_cache,
+ 128,
+@@ -454,7 +454,7 @@ globus_l_gsc_timeout_cb(
+ }
+ else
+ {
+- globus_l_gsc_final_reply(server_handle,
++ globus_l_gsc_final_reply(server_handle,
+ _FSMSL("421 Idle Timeout: closing control connection.\r\n"));
+ rc = GLOBUS_TRUE;
+ }
+@@ -555,12 +555,12 @@ globus_i_gsc_op_destroy(
+ if(op->stat_info[ctr].name != NULL)
+ {
+ globus_free(op->stat_info[ctr].name);
+- }
++ }
+ if(op->stat_info[ctr].symlink_target != NULL)
+ {
+ globus_free(op->stat_info[ctr].symlink_target);
+ }
+- }
++ }
+ globus_free(op->stat_info);
+ }
+ if(op->cs != NULL)
+@@ -649,26 +649,26 @@ globus_l_gsc_trans_table_copy(
+ /*
+ * Read Callback
+ * -------------
+- * Every time a command comes in this function is called.
++ * Every time a command comes in this function is called.
+ *
+ * Reads are continually posted and queued. The reason for this is
+ * the ABOR case. Since an ABOR is read as oobinline we must have
+ * a read posted while a command is being process. This leads to
+- * the possibility of commands other than ABOR being read while a
++ * the possibility of commands other than ABOR being read while a
+ * preceding command is being processed, the solution to this is to
+ * constantly read and queue all commands.
+ *
+ * states
+ * on error simply call terminate
+ *
+- * OPEN :
++ * OPEN :
+ * read and queue the command. If the command is ABOR reply
+ * imediatly and post another read, else start processing
+ * the next command in the queue
+ *
+- * PROCESSING :
++ * PROCESSING :
+ * simply queue the command and post another read. if the command
+- * is ABOR, change to ABORTING STATE and call the users abort
++ * is ABOR, change to ABORTING STATE and call the users abort
+ * callback.
+ *
+ * STOPPING/ABORTING_STOPPING:
+@@ -745,8 +745,8 @@ globus_l_gsc_read_cb(
+ case GLOBUS_L_GSC_STATE_PROCESSING:
+ /* parse out the command name */
+ command_name = (char *) globus_malloc(len + 1);
+- for(ctr = 0, tmp_ptr = buffer;
+- *tmp_ptr != ' ' && *tmp_ptr != '\r'
++ for(ctr = 0, tmp_ptr = buffer;
++ *tmp_ptr != ' ' && *tmp_ptr != '\r'
+ && *tmp_ptr != '\n' && ctr < len;
+ tmp_ptr++, ctr++)
+ {
+@@ -773,10 +773,10 @@ globus_l_gsc_read_cb(
+ {
+ globus_l_gsc_process_next_cmd(server_handle);
+ }
+- /* allow outstanding commands, just queue them up, but
++ /* allow outstanding commands, just queue them up, but
+ only to a certain number */
+- if(globus_fifo_size(&server_handle->read_q) <
+- server_handle->max_q_len ||
++ if(globus_fifo_size(&server_handle->read_q) <
++ server_handle->max_q_len ||
+ server_handle->max_q_len <= 0)
+ {
+ res = globus_xio_register_read(
+@@ -845,7 +845,7 @@ globus_l_gsc_read_cb(
+ GLOBUS_GRIDFTP_SERVER_CONTROL_EVENT_ABORT &&
+ /* this last codition make deal with a race of an
+ abort and a finished transfer */
+- server_handle->data_object->state ==
++ server_handle->data_object->state ==
+ GLOBUS_L_GSC_DATA_OBJ_INUSE)
+ {
+ assert(server_handle->data_object->state == GLOBUS_L_GSC_DATA_OBJ_INUSE);
+@@ -853,7 +853,7 @@ assert(server_handle->data_object->state == GLOBUS_L_GSC_DATA_OBJ_INUSE);
+ server_handle->outstanding_op,
+ GLOBUS_GRIDFTP_SERVER_CONTROL_EVENT_ABORT,
+ server_handle->outstanding_op->event.user_arg);
+- server_handle->outstanding_op->aborted =
++ server_handle->outstanding_op->aborted =
+ GLOBUS_FALSE;
+ }
+ }
+@@ -902,11 +902,11 @@ err:
+ *
+ * This is called in a few places. It is called when a user decideds
+ * to terminate the conection via _stop(), when the command modules
+- * panic (typically due to being out of memory) or when an error
++ * panic (typically due to being out of memory) or when an error
+ * occurs on the client connection (typically due to it closing).
+ *
+ * states:
+- *
++ *
+ * OPENING:
+ * Noting has really been done yet, there is possibly an outstanding
+ * open or an outstaning write. cancel any open and write callbacks.
+@@ -914,13 +914,13 @@ err:
+ *
+ * OPEN:
+ * There are no outstanidng commands so move to the stoping state,
+- * cancel the command read that is posted. When the canceled read
+- * returns the termination process will continue.
++ * cancel the command read that is posted. When the canceled read
++ * returns the termination process will continue.
+ *
+ * PROCESSING:
+ * A command is outstanding so move to the ABORTING_STOPPING state,
+ * call the users abort callback. When the finished op command returns
+- * the termination process will continue.
++ * the termination process will continue.
+ * Flush any commands that have been read with an error.
+ *
+ * ABORTING:
+@@ -966,18 +966,18 @@ globus_l_gsc_terminate(
+ globus_i_guc_data_object_destroy(server_handle, data_obj);
+ server_handle->data_object = NULL;
+ break;
+-
++
+ case GLOBUS_L_GSC_DATA_OBJ_DESTROY_WAIT:
+ case GLOBUS_L_GSC_DATA_OBJ_DESTROYING:
+ /* do nuttin */
+ break;
+-
++
+ case GLOBUS_L_GSC_DATA_OBJ_INUSE:
+ /* start an abort event */
+ dh_to_abort = GLOBUS_TRUE;
+ data_obj->state = GLOBUS_L_GSC_DATA_OBJ_DESTROY_WAIT;
+ break;
+-
++
+ default:
+ globus_assert(0 && "possible memory corruption");
+ break;
+@@ -1076,7 +1076,7 @@ i
+
+ /* is ok to call this twice stopped twice:
+ ex: client quits, read callback returns with error, then user
+- quits before getting the done callback.
++ quits before getting the done callback.
+ In these cases there is nothing to be done. */
+ case GLOBUS_L_GSC_STATE_ABORTING_STOPPING:
+ case GLOBUS_L_GSC_STATE_STOPPING:
+@@ -1146,18 +1146,18 @@ globus_gsc_959_terminate(
+ * this is ulmiately called when a command module finishes a command
+ *
+ * states:
+- *
++ *
+ * PROCESSING:
+ * if the command is finished (reply_msg != NULL), then send the final
+ * reply else call the next in the chain. The state will be changed
+ * when the final reply returns.
+- *
++ *
+ * ABORTING:
+- * flush the commands read q and send out the final abort message, if
++ * flush the commands read q and send out the final abort message, if
+ * final reply is successful another read will be posted.
+ *
+ * ABORTING_STOPPING:
+- * move to the STOPPING state. If reference is zero kickout done
++ * move to the STOPPING state. If reference is zero kickout done
+ * callback
+ *
+ * STOPPING:
+@@ -1295,7 +1295,7 @@ globus_l_gsc_finished_op(
+ * is called once the 220 is written and if succesful moves things
+ * to the OPEN state.
+ */
+-static void
++static void
+ globus_l_gsc_220_write_cb(
+ globus_xio_handle_t xio_handle,
+ globus_result_t result,
+@@ -1417,7 +1417,7 @@ err:
+ /*
+ * callback for replies
+ */
+-static void
++static void
+ globus_l_gsc_final_reply_cb(
+ globus_xio_handle_t xio_handle,
+ globus_result_t result,
+@@ -1474,7 +1474,7 @@ globus_l_gsc_final_reply_cb(
+ (void *) server_handle);
+ if(res != GLOBUS_SUCCESS)
+ {
+- goto err;
++ goto err;
+ }
+ GlobusLServerRefInc(server_handle);
+ GlobusGSCHandleStateChange(
+@@ -1539,7 +1539,7 @@ globus_l_gsc_final_reply_cb(
+ return;
+ }
+
+-static void
++static void
+ globus_l_gsc_intermediate_reply_cb(
+ globus_xio_handle_t xio_handle,
+ globus_result_t result,
+@@ -1690,11 +1690,11 @@ globus_l_gsc_user_close_kickout(
+ }
+ globus_mutex_unlock(&server_handle->mutex);
+
+- /* call destroy on all the data connections, if not in the list
++ /* call destroy on all the data connections, if not in the list
+ then a call is already pending on it */
+ while(!globus_list_empty(data_conn_list))
+ {
+- data_object = (globus_i_gsc_data_t *)
++ data_object = (globus_i_gsc_data_t *)
+ globus_list_remove(&data_conn_list, data_conn_list);
+ if(server_handle->funcs.data_destroy_cb != NULL)
+ {
+@@ -1720,7 +1720,7 @@ globus_l_gsc_user_close_kickout(
+
+ /*
+ * close callback
+- *
++ *
+ * handle is not closed until user requests a close.
+ */
+ static void
+@@ -1762,9 +1762,9 @@ globus_i_guc_data_object_destroy(
+ if(data_object)
+ {
+ globus_hashtable_remove(
+- &server_handle->data_object_table,
++ &server_handle->data_object_table,
+ data_object->user_handle);
+-
++
+ if(server_handle->funcs.data_destroy_cb != NULL)
+ {
+ GlobusLServerRefInc(server_handle);
+@@ -1953,7 +1953,7 @@ globus_l_gsc_parse_command(
+ return -1;
+ }
+
+-static void
++static void
+ globus_l_gsc_free_command_array(
+ char ** cmd_a)
+ {
+@@ -2014,7 +2014,7 @@ globus_i_gsc_concat_path(
+
+ globus_mutex_lock(&i_server->mutex);
+ {
+-
++
+ if(in_path[0] == '/')
+ {
+ tmp_path = globus_libc_strdup(in_path);
+@@ -2043,7 +2043,7 @@ globus_i_gsc_concat_path(
+ {
+ goto error;
+ }
+-
++
+ /* remove all double slashes */
+ tmp_ptr = strstr(tmp_path, "//");
+ while(tmp_ptr != NULL)
+@@ -2140,19 +2140,19 @@ globus_i_gridftp_server_control_cs_verify(
+ else if(net_prt == GLOBUS_GRIDFTP_SERVER_CONTROL_PROTOCOL_IPV6)
+ {
+ globus_xio_contact_t contact_info;
+-
++
+ if(globus_xio_contact_parse(&contact_info, cs) != GLOBUS_SUCCESS)
+ {
+ return GLOBUS_FALSE;
+ }
+-
+- if(!(contact_info.host && contact_info.port) ||
++
++ if(!(contact_info.host && contact_info.port) ||
+ (unsigned) atoi(contact_info.port) > 65535)
+ {
+ globus_xio_contact_destroy(&contact_info);
+ return GLOBUS_FALSE;
+ }
+-
++
+ /* verify that the string contains nothing but
+ * hex digits, ':'. and '.'
+ */
+@@ -2166,9 +2166,9 @@ globus_i_gridftp_server_control_cs_verify(
+ }
+ cs++;
+ }
+-
++
+ globus_xio_contact_destroy(&contact_info);
+-
++
+ return GLOBUS_TRUE;
+ }
+
+@@ -2195,7 +2195,7 @@ globus_l_gsc_cmd_site(
+ {
+ char * tmp_ptr;
+ GlobusGridFTPServerName(globus_l_gsc_cmd_site);
+-
++
+ GlobusGridFTPServerDebugInternalEnter();
+
+ /* to upper in the actual initial buffer */
+@@ -2208,7 +2208,7 @@ globus_l_gsc_cmd_site(
+ *tmp_ptr = toupper(*tmp_ptr);
+ }
+ *tmp_ptr = '\0';
+-
++
+ globus_assert(op->cmd_list == NULL);
+
+ # if defined(GLOBUS_L_SITE_TEST_SUITE_MSG)
+@@ -2281,7 +2281,7 @@ globus_l_gsc_command_callout(
+ if(op->cmd_list == NULL)
+ {
+ /* log unknown */
+- globus_i_gsc_log(server_handle, op->command,
++ globus_i_gsc_log(server_handle, op->command,
+ GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_ERROR);
+
+ globus_i_gsc_op_destroy(op);
+@@ -2297,7 +2297,7 @@ globus_l_gsc_command_callout(
+ {
+ msg = _FSMSL("530 Please login with USER and PASS.\r\n");
+ }
+- else if(auth &&
++ else if(auth &&
+ !(cmd_ent->desc & GLOBUS_GSC_COMMAND_POST_AUTH))
+ {
+ msg = _FSMSL("503 You are already logged in.\r\n");
+@@ -2324,10 +2324,10 @@ globus_l_gsc_command_callout(
+ char ** restrict_args = NULL;
+ int i;
+ char * restrict_cmd;
+-
++
+ restrict_cmd = globus_list_first(list);
+ list = globus_list_rest(list);
+-
++
+ globus_l_gsc_parse_command(
+ restrict_cmd, &restrict_args, cmd_ent->max_argc);
+
+@@ -2336,7 +2336,7 @@ globus_l_gsc_command_callout(
+ {
+ i++;
+ }
+-
++
+ do
+ {
+ if(!cmd_array[i] || !restrict_args || !restrict_args[i])
+@@ -2356,13 +2356,13 @@ globus_l_gsc_command_callout(
+ }
+ i++;
+ } while(fail_restrict && !done);
+-
++
+ if(restrict_args)
+ {
+ globus_l_gsc_free_command_array(restrict_args);
+ }
+- }
+-
++ }
++
+ if(argc < cmd_ent->min_argc)
+ {
+ globus_gsc_959_finished_command(op,
+@@ -2462,7 +2462,7 @@ globus_l_gsc_final_reply(
+ goto error_alloc;
+ }
+ len = strlen(tmp_ptr);
+-
++
+ globus_i_gsc_log(
+ server_handle, message, GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_REPLY);
+ res = globus_xio_register_write(
+@@ -2621,7 +2621,7 @@ globus_gridftp_server_control_init(
+ server_handle->max_q_len = globus_l_gsc_max_read_q;
+ server_handle->state = GLOBUS_L_GSC_STATE_NONE;
+ server_handle->reply_outstanding = GLOBUS_FALSE;
+- server_handle->pre_auth_banner =
++ server_handle->pre_auth_banner =
+ globus_libc_strdup(GLOBUS_L_GSC_DEFAULT_220);
+ globus_fifo_init(&server_handle->read_q);
+ globus_fifo_init(&server_handle->reply_q);
+@@ -2631,7 +2631,7 @@ globus_gridftp_server_control_init(
+ 128,
+ globus_hashtable_string_hash,
+ globus_hashtable_string_keyeq);
+-
++
+ globus_hashtable_init(
+ &server_handle->site_cmd_table,
+ 128,
+@@ -2643,7 +2643,7 @@ globus_gridftp_server_control_init(
+ 256,
+ globus_hashtable_voidp_hash,
+ globus_hashtable_voidp_keyeq);
+-
++
+ globus_i_gsc_add_commands(server_handle);
+
+ *server = server_handle;
+@@ -2726,7 +2726,7 @@ globus_gridftp_server_control_destroy(
+ {
+ cmd_ent = (globus_l_gsc_cmd_ent_t *) globus_list_remove(
+ &server_handle->all_cmd_list, server_handle->all_cmd_list);
+-
++
+ if(cmd_ent->cmd_name != NULL)
+ {
+ globus_free(cmd_ent->cmd_name);
+@@ -2819,7 +2819,7 @@ globus_gridftp_server_control_start(
+ goto err;
+ #endif
+ }
+-
++
+ if(S_ISFIFO(statbuf.st_mode))
+ {
+ transport = globus_l_gsc_pipe_driver;
+@@ -2902,7 +2902,7 @@ globus_gridftp_server_control_start(
+ }
+ res = globus_xio_attr_cntl(
+ xio_attr, globus_l_gsc_gsi_driver,
+- GLOBUS_XIO_GSI_SET_PROTECTION_LEVEL,
++ GLOBUS_XIO_GSI_SET_PROTECTION_LEVEL,
+ GLOBUS_XIO_GSI_PROTECTION_LEVEL_PRIVACY);
+ if(res != GLOBUS_SUCCESS)
+ {
+@@ -2958,7 +2958,7 @@ globus_gridftp_server_control_start(
+ else if(transport == globus_l_gsc_pipe_driver)
+ {
+ int outfd;
+-
++
+ res = globus_xio_attr_cntl(xio_attr, globus_l_gsc_pipe_driver,
+ GLOBUS_XIO_PIPE_SET_IN_HANDLE, system_handle);
+ if(res != GLOBUS_SUCCESS)
+@@ -3010,10 +3010,10 @@ globus_gridftp_server_control_start(
+ server_handle->funcs.done_cb = done_cb;
+
+ globus_hashtable_copy(
+- &server_handle->funcs.send_cb_table,
++ &server_handle->funcs.send_cb_table,
+ &i_attr->funcs.send_cb_table, globus_l_gsc_trans_table_copy);
+ globus_hashtable_copy(
+- &server_handle->funcs.recv_cb_table,
++ &server_handle->funcs.recv_cb_table,
+ &i_attr->funcs.recv_cb_table, globus_l_gsc_trans_table_copy);
+
+ if(server_handle->modes != NULL)
+@@ -3026,7 +3026,7 @@ globus_gridftp_server_control_start(
+ }
+ /* default options */
+ strcpy(server_handle->opts.mlsx_fact_str, "TMSPUOIGDQLAN");
+- server_handle->opts.send_buf = 0;
++ server_handle->opts.send_buf = 0;
+ server_handle->opts.perf_frequency = 5;
+ server_handle->opts.retr_perf_frequency = 0;
+ server_handle->opts.restart_frequency = 5;
+@@ -3068,16 +3068,16 @@ globus_gridftp_server_control_start(
+ }
+ server_handle->cwd = globus_libc_strdup(i_attr->base_dir);
+ server_handle->default_cwd = NULL;
+-
++
+ if(i_attr->pre_auth_banner != NULL)
+ {
+ globus_free(server_handle->pre_auth_banner);
+- server_handle->pre_auth_banner =
++ server_handle->pre_auth_banner =
+ globus_libc_strdup(i_attr->pre_auth_banner);
+ }
+ if(i_attr->post_auth_banner != NULL)
+ {
+- server_handle->post_auth_banner =
++ server_handle->post_auth_banner =
+ globus_libc_strdup(i_attr->post_auth_banner);
+ }
+
+@@ -3098,8 +3098,8 @@ globus_gridftp_server_control_start(
+ GlobusGSCHandleStateChange(
+ server_handle, GLOBUS_L_GSC_STATE_OPENING);
+ res = globus_xio_register_open(
+- server_handle->xio_handle,
+- NULL,
++ server_handle->xio_handle,
++ NULL,
+ xio_attr,
+ globus_l_gsc_open_cb,
+ server_handle);
+@@ -3189,7 +3189,7 @@ globus_i_gsc_command_panic(
+ GlobusGSCHandleStateChange(
+ op->server_handle, GLOBUS_L_GSC_STATE_STOPPING);
+
+- /* not much can be done about an error here, we are terminating
++ /* not much can be done about an error here, we are terminating
+ anyway */
+ res = globus_l_gsc_final_reply(
+ op->server_handle,
+@@ -3434,11 +3434,11 @@ globus_gsc_959_command_remove(
+ {
+ *tmp_ptr = toupper(*tmp_ptr);
+ }
+-
++
+ if(strncmp("SITE ", cmd_name, 5) == 0 && strlen(cmd_name) > 5)
+ {
+ char * save_ptr;
+-
++
+ tmp_ptr = (char *)&cmd_name[5];
+ while(*tmp_ptr == ' ') tmp_ptr++;
+ save_ptr = tmp_ptr;
+@@ -3447,7 +3447,7 @@ globus_gsc_959_command_remove(
+ *tmp_ptr = toupper(*tmp_ptr);
+ }
+ tmp_ptr = save_ptr;
+-
++
+ restrict_args = strchr(tmp_ptr, ' ');
+ if(restrict_args)
+ {
+@@ -3498,11 +3498,11 @@ globus_gsc_959_command_remove(
+ }
+
+ if(restrict_args && *restrict_args)
+- {
++ {
+ while(!globus_list_empty(list))
+ {
+ cmd_ent = (globus_l_gsc_cmd_ent_t *) globus_list_first(list);
+-
++
+ globus_list_insert(
+ &cmd_ent->restrict_list,
+ globus_common_create_string("%s %s\r\n",spacer, restrict_args));
+@@ -3516,7 +3516,7 @@ globus_gsc_959_command_remove(
+ {
+ cmd_ent = (globus_l_gsc_cmd_ent_t *)
+ globus_list_remove(&list, list);
+-
++
+ if(cmd_ent->help)
+ {
+ globus_free(cmd_ent->help);
+@@ -3533,7 +3533,7 @@ globus_gsc_959_command_remove(
+ globus_free(cmd_name);
+ }
+ globus_mutex_unlock(&server_handle->mutex);
+-
++
+ return GLOBUS_SUCCESS;
+
+ error_notexist:
+@@ -3610,12 +3610,12 @@ globus_i_gsc_get_help(
+ _FSMSL("214-Help for %s:\r\n"), command_name);
+ while(!globus_list_empty(site_list))
+ {
+- list = (globus_list_t *)
++ list = (globus_list_t *)
+ globus_list_remove(&site_list, site_list);
+
+ while(!globus_list_empty(list))
+ {
+- cmd_ent = (globus_l_gsc_cmd_ent_t *)
++ cmd_ent = (globus_l_gsc_cmd_ent_t *)
+ globus_list_first(list);
+ if(cmd_ent->help != NULL)
+ {
+@@ -3667,10 +3667,10 @@ globus_i_gsc_get_help(
+ }
+
+ /* preline only affects multiline strings.
+- a null preline will prepend a "code-" to the front of each line by default,
++ a null preline will prepend a "code-" to the front of each line by default,
+ otherwise the preline is prepended.
+ used to follow spec for mlst where the lines MUST be prepended with exactly
+- one space, but general multiline responses are allowed to have any
++ one space, but general multiline responses are allowed to have any
+ (or none at all, i.e. "") padding text */
+ char *
+ globus_gsc_string_to_959(
+@@ -3727,8 +3727,8 @@ globus_gsc_string_to_959(
+
+ tmp_ptr = msg;
+ msg = globus_common_create_string(
+- "%s%s%s\r\n",
+- tmp_ptr,
++ "%s%s%s\r\n",
++ tmp_ptr,
+ (ctr > 0) ? prepad : "",
+ start_ptr);
+ globus_free(tmp_ptr);
+@@ -3792,10 +3792,10 @@ globus_l_gsc_mlsx_urlencode(
+ if(NEEDS_ENCODING(*in_ptr))
+ {
+ enc_count++;
+- }
++ }
+ in_ptr++;
+ }
+-
++
+ if(enc_count)
+ {
+ enc_count = 0;
+@@ -3808,7 +3808,7 @@ globus_l_gsc_mlsx_urlencode(
+ *out_ptr++ = hex_chars[(*in_ptr >> 4) & 0xF];
+ *out_ptr++ = hex_chars[*in_ptr & 0xF];
+ enc_count++;
+- }
++ }
+ else
+ {
+ *out_ptr++ = *in_ptr;
+@@ -3822,7 +3822,7 @@ globus_l_gsc_mlsx_urlencode(
+ {
+ *out_string = (char *) in_string;
+ }
+-
++
+ return enc_count;
+ GlobusGridFTPServerDebugInternalExit();
+ }
+@@ -3836,15 +3836,15 @@ globus_libc_cached_getpwuid(
+ struct passwd * result_pw = NULL;
+ globus_l_libc_cached_pwent_t * pwent;
+ int rc;
+-
++
+ /* XXX TODO make proper function in globus_libc */
+ pwent = (globus_l_libc_cached_pwent_t *) globus_hashtable_lookup(
+ &globus_l_gsc_pwent_cache, (void *) (intptr_t) uid);
+
+ if(pwent == NULL)
+ {
+- pwent = (globus_l_libc_cached_pwent_t *)
+- globus_calloc(1, sizeof(globus_l_libc_cached_pwent_t)); rc = globus_libc_getpwuid_r(
++ pwent = (globus_l_libc_cached_pwent_t *)
++ globus_calloc(1, sizeof(globus_l_libc_cached_pwent_t)); rc = globus_libc_getpwuid_r(
+ uid, &pwent->pw, pwent->buffer, GSU_MAX_PW_LENGTH, &result_pw);
+ if(rc != 0 || result_pw == NULL)
+ {
+@@ -3861,12 +3861,12 @@ globus_libc_cached_getpwuid(
+ }
+
+ return &pwent->pw;
+-
++
+ error_pwent:
+ globus_free(pwent);
+ #endif
+ return NULL;
+-}
++}
+
+ static
+ struct group *
+@@ -3896,9 +3896,9 @@ globus_libc_cached_getgrgid(
+ grent->gr_gid = gr->gr_gid;
+ /* we don't use other members */
+ globus_libc_unlock();
+-
++
+ grent->gr_name = globus_libc_strdup(name);
+-
++
+ globus_hashtable_insert(
+ &globus_l_gsc_grent_cache,
+ (void *) (intptr_t) grent->gr_gid,
+@@ -3906,12 +3906,12 @@ globus_libc_cached_getgrgid(
+ }
+
+ return grent;
+-
++
+ error_group:
+ globus_libc_unlock();
+ globus_free(grent);
+ return NULL;
+-}
++}
+
+ char *
+ globus_i_gsc_nlst_line(
+@@ -3939,7 +3939,7 @@ globus_i_gsc_nlst_line(
+ if(buf_left < (tmp_i + 3))
+ {
+ int ndx;
+-
++
+ ndx = tmp_ptr - buf;
+ buf_left += buf_len + tmp_i + 3;
+ buf_len += buf_len + tmp_i + 3;
+@@ -3987,8 +3987,8 @@ globus_i_gsc_mlsx_line_single(
+
+ GlobusGridFTPServerDebugInternalEnter();
+
+- buf_len = MAXPATHLEN * 4 + 256; /* rough guess... could be a maxpathlen
+- for the path, and 3*maxpathlen for
++ buf_len = MAXPATHLEN * 4 + 256; /* rough guess... could be a maxpathlen
++ for the path, and 3*maxpathlen for
+ the urlencoded link target */
+ out_buf = globus_malloc(buf_len);
+
+@@ -4004,7 +4004,7 @@ globus_i_gsc_mlsx_line_single(
+ case GLOBUS_GSC_MLSX_FACT_TYPE:
+ if(S_ISREG(stat_info->mode))
+ {
+- sprintf(tmp_ptr, "Type=file;");
++ sprintf(tmp_ptr, "Type=file;");
+ }
+ else if(S_ISDIR(stat_info->mode))
+ {
+@@ -4028,25 +4028,25 @@ globus_i_gsc_mlsx_line_single(
+ sprintf(tmp_ptr, "Type=dir;");
+ }
+ }
+- else if(S_ISLNK(stat_info->mode))
++ else if(S_ISLNK(stat_info->mode))
+ {
+ sprintf(tmp_ptr, "Type=slink;");
+ }
+ else if(S_ISCHR(stat_info->mode))
+ {
+- sprintf(tmp_ptr, "Type=OS.unix=chr;");
++ sprintf(tmp_ptr, "Type=OS.unix=chr;");
+ }
+ else if(S_ISBLK(stat_info->mode))
+ {
+- sprintf(tmp_ptr, "Type=OS.unix=blk;");
++ sprintf(tmp_ptr, "Type=OS.unix=blk;");
+ }
+ else if(S_ISFIFO(stat_info->mode))
+ {
+- sprintf(tmp_ptr, "Type=OS.unix=pipe;");
++ sprintf(tmp_ptr, "Type=OS.unix=pipe;");
+ }
+ else
+ {
+- sprintf(tmp_ptr, "Type=OS.unix=other;");
++ sprintf(tmp_ptr, "Type=OS.unix=other;");
+ }
+ break;
+
+@@ -4062,7 +4062,7 @@ globus_i_gsc_mlsx_line_single(
+ break;
+
+ case GLOBUS_GSC_MLSX_FACT_SIZE:
+- sprintf(tmp_ptr,
++ sprintf(tmp_ptr,
+ "Size=%"GLOBUS_OFF_T_FORMAT";", stat_info->size);
+ break;
+
+@@ -4118,7 +4118,7 @@ globus_i_gsc_mlsx_line_single(
+ *(tmp_ptr++) = 'w';
+ }
+
+- if(is_writable && is_executable &&
++ if(is_writable && is_executable &&
+ S_ISDIR(stat_info->mode))
+ {
+ *(tmp_ptr++) = 'c';
+@@ -4130,7 +4130,7 @@ globus_i_gsc_mlsx_line_single(
+ {
+ *(tmp_ptr++) = 'e';
+ }
+- if(is_readable && is_executable &&
++ if(is_readable && is_executable &&
+ S_ISDIR(stat_info->mode))
+ {
+ *(tmp_ptr++) = 'l';
+@@ -4145,26 +4145,26 @@ globus_i_gsc_mlsx_line_single(
+ break;
+
+ case GLOBUS_GSC_MLSX_FACT_UNIXMODE:
+- sprintf(tmp_ptr, "UNIX.mode=%04o;",
++ sprintf(tmp_ptr, "UNIX.mode=%04o;",
+ (unsigned) (stat_info->mode & 07777));
+ break;
+
+ case GLOBUS_GSX_MLSX_FACT_UNIXUID:
+ sprintf(tmp_ptr, "UNIX.uid=%d;", stat_info->uid);
+ break;
+-
++
+ case GLOBUS_GSX_MLSX_FACT_UNIXGID:
+ sprintf(tmp_ptr, "UNIX.gid=%d;", stat_info->gid);
+ break;
+-
++
+ case GLOBUS_GSC_MLSX_FACT_UNIXOWNER:
+ pw = globus_libc_cached_getpwuid(stat_info->uid);
+ enc_str = NULL;
+ if(pw)
+- {
++ {
+ cnt = globus_l_gsc_mlsx_urlencode(pw->pw_name, &enc_str);
+ }
+-
++
+ if(enc_str)
+ {
+ sprintf(tmp_ptr, "UNIX.owner=%s;", enc_str);
+@@ -4179,10 +4179,10 @@ globus_i_gsc_mlsx_line_single(
+ gr = globus_libc_cached_getgrgid(stat_info->gid);
+ enc_str = NULL;
+ if(gr)
+- {
++ {
+ cnt = globus_l_gsc_mlsx_urlencode(gr->gr_name, &enc_str);
+ }
+-
++
+ if(enc_str)
+ {
+ sprintf(tmp_ptr, "UNIX.group=%s;", enc_str);
+@@ -4194,13 +4194,13 @@ globus_i_gsc_mlsx_line_single(
+ break;
+
+ case GLOBUS_GSC_MLSX_FACT_UNIQUE:
+- sprintf(tmp_ptr, "Unique=%lx-%lx;",
++ sprintf(tmp_ptr, "Unique=%lx-%lx;",
+ (unsigned long) stat_info->dev,
+ (unsigned long) stat_info->ino);
+ break;
+
+ case GLOBUS_GSC_MLSX_FACT_UNIXSLINK:
+- if(stat_info->symlink_target != NULL &&
++ if(stat_info->symlink_target != NULL &&
+ *stat_info->symlink_target != '\0')
+ {
+ encoded_symlink_target = NULL;
+@@ -4208,7 +4208,7 @@ globus_i_gsc_mlsx_line_single(
+ stat_info->symlink_target, &encoded_symlink_target);
+ if(encoded_symlink_target != NULL)
+ {
+- sprintf(tmp_ptr,
++ sprintf(tmp_ptr,
+ "UNIX.slink=%s;", encoded_symlink_target);
+ if(cnt)
+ {
+@@ -4222,7 +4222,7 @@ globus_i_gsc_mlsx_line_single(
+ if(is_cdir && absolute_path)
+ {
+ const char * slash = "/";
+-
++
+ enc_str = NULL;
+ if(absolute_path[strlen(absolute_path) - 1] == '/')
+ {
+@@ -4250,8 +4250,8 @@ globus_i_gsc_mlsx_line_single(
+ }
+ tmp_ptr += strlen(tmp_ptr);
+ }
+-
+- switch (stat_info->error)
++
++ switch (stat_info->error)
+ {
+ case GLOBUS_GRIDFTP_SERVER_CONTROL_STAT_SUCCESS:
+ break;
+@@ -4264,19 +4264,19 @@ globus_i_gsc_mlsx_line_single(
+ tmp_ptr += strlen(tmp_ptr);
+ break;
+ }
+-
+- if(base_path)
++
++ if(base_path)
+ {
+ if(stat_info->name[0] == '\0')
+ {
+ /** Don't print trailing slash if no name */
+ sprintf(tmp_ptr, " %s", base_path);
+- }
+- else
++ }
++ else
+ {
+ sprintf(tmp_ptr, " %s/%s", base_path, stat_info->name);
+ }
+- }
++ }
+ else
+ {
+ sprintf(tmp_ptr, " %s", stat_info->name);
+@@ -4293,7 +4293,7 @@ globus_i_gsc_mlsx_line(
+ const char * mlsx_fact_str,
+ uid_t uid,
+ const char * base_path,
+- const char * absolute_path,
++ const char * absolute_path,
+ globus_bool_t indent)
+ {
+ char * line;
+@@ -4327,7 +4327,7 @@ globus_i_gsc_mlsx_line(
+ if(buf_left < (tmp_i + 4))
+ {
+ int ndx;
+-
++
+ ndx = tmp_ptr - buf;
+ buf_left += buf_len + tmp_i + 4;
+ buf_len += buf_len + tmp_i + 4;
+@@ -4353,7 +4353,7 @@ globus_i_gsc_mlsx_line(
+ GlobusGridFTPServerDebugInternalExit();
+ return buf;
+ }
+-
++
+ /*
+ * turn a stat struct into a string
+ */
+@@ -4398,7 +4398,7 @@ globus_i_gsc_list_single_line(
+ {
+ snprintf(grpname, sizeof(grpname), "%s", gr->gr_name);
+ }
+-
++
+ if(S_ISDIR(stat_info->mode))
+ {
+ perms[0] = 'd';
+@@ -4419,7 +4419,7 @@ globus_i_gsc_list_single_line(
+ {
+ perms[0] = 'b';
+ }
+-
++
+ if(S_IRUSR & stat_info->mode)
+ {
+ perms[1] = 'r';
+@@ -4505,11 +4505,11 @@ globus_i_gsc_list_line(
+ {
+ no_match = fnmatch(glob_match_str, stat_info[ctr].name, 0);
+ }
+-#endif
++#endif
+ if(no_match)
+ {
+ continue;
+- }
++ }
+ line = globus_i_gsc_list_single_line(&stat_info[ctr]);
+ if(line != NULL)
+ {
+@@ -4517,14 +4517,14 @@ globus_i_gsc_list_line(
+ if(buf_left < (tmp_i + 3))
+ {
+ int ndx;
+-
++
+ ndx = tmp_ptr - buf;
+ buf_left += buf_len + tmp_i + 3;
+ buf_len += buf_len + tmp_i + 3;
+ buf = globus_libc_realloc(buf, buf_len);
+ tmp_ptr = buf + ndx;
+ }
+-
++
+ memcpy(tmp_ptr, line, tmp_i);
+ tmp_ptr[tmp_i++] = '\r';
+ tmp_ptr[tmp_i++] = '\n';
+@@ -4747,7 +4747,7 @@ globus_i_gsc_port(
+ switch(op->server_handle->data_object->state)
+ {
+ case GLOBUS_L_GSC_DATA_OBJ_READY:
+- op->server_handle->data_object->state =
++ op->server_handle->data_object->state =
+ GLOBUS_L_GSC_DATA_OBJ_DESTROYING;
+ globus_i_guc_data_object_destroy(
+ op->server_handle, op->server_handle->data_object);
+@@ -4826,13 +4826,13 @@ globus_i_gsc_passive(
+ switch(op->server_handle->data_object->state)
+ {
+ case GLOBUS_L_GSC_DATA_OBJ_READY:
+- op->server_handle->data_object->state =
++ op->server_handle->data_object->state =
+ GLOBUS_L_GSC_DATA_OBJ_DESTROYING;
+ globus_i_guc_data_object_destroy(
+ op->server_handle, op->server_handle->data_object);
+ op->server_handle->data_object = NULL;
+ break;
+-
++
+ case GLOBUS_L_GSC_DATA_OBJ_DESTROYING:
+ /* do nuttin */
+ break;
+@@ -4897,7 +4897,7 @@ globus_i_gsc_list(
+ globus_mutex_lock(&op->server_handle->mutex);
+ {
+ if(op->server_handle->data_object == NULL ||
+- !(op->server_handle->data_object->dir &
++ !(op->server_handle->data_object->dir &
+ GLOBUS_GRIDFTP_SERVER_CONTROL_DATA_DIR_SEND))
+ {
+ globus_mutex_unlock(&op->server_handle->mutex);
+@@ -4908,7 +4908,7 @@ globus_i_gsc_list(
+ {
+ /* the state we want */
+ case GLOBUS_L_GSC_DATA_OBJ_READY:
+- op->server_handle->data_object->state =
++ op->server_handle->data_object->state =
+ GLOBUS_L_GSC_DATA_OBJ_INUSE;
+ break;
+
+@@ -4949,7 +4949,7 @@ globus_i_gsc_list(
+
+ case GLOBUS_L_GSC_OP_TYPE_MLSR:
+ depth = -1;
+-
++
+ case GLOBUS_L_GSC_OP_TYPE_MLSD:
+ default:
+ fact_str = op->server_handle->opts.mlsx_fact_str;
+@@ -4963,7 +4963,7 @@ globus_i_gsc_list(
+ if(user_cb != NULL)
+ {
+ user_cb(
+- op,
++ op,
+ op->server_handle->data_object->user_handle,
+ op->path,
+ fact_str,
+@@ -5012,7 +5012,7 @@ globus_i_gsc_send(
+ globus_mutex_lock(&op->server_handle->mutex);
+ {
+ if(op->server_handle->data_object == NULL ||
+- !(op->server_handle->data_object->dir &
++ !(op->server_handle->data_object->dir &
+ GLOBUS_GRIDFTP_SERVER_CONTROL_DATA_DIR_SEND))
+ {
+ globus_mutex_unlock(&op->server_handle->mutex);
+@@ -5022,7 +5022,7 @@ globus_i_gsc_send(
+ {
+ /* the state we want */
+ case GLOBUS_L_GSC_DATA_OBJ_READY:
+- op->server_handle->data_object->state =
++ op->server_handle->data_object->state =
+ GLOBUS_L_GSC_DATA_OBJ_INUSE;
+ break;
+
+@@ -5122,7 +5122,7 @@ globus_i_gsc_recv(
+ globus_mutex_lock(&op->server_handle->mutex);
+ {
+ if(op->server_handle->data_object == NULL ||
+- !(op->server_handle->data_object->dir &
++ !(op->server_handle->data_object->dir &
+ GLOBUS_GRIDFTP_SERVER_CONTROL_DATA_DIR_RECV))
+ {
+ globus_mutex_unlock(&op->server_handle->mutex);
+@@ -5132,7 +5132,7 @@ globus_i_gsc_recv(
+ {
+ /* the state we want */
+ case GLOBUS_L_GSC_DATA_OBJ_READY:
+- op->server_handle->data_object->state =
++ op->server_handle->data_object->state =
+ GLOBUS_L_GSC_DATA_OBJ_INUSE;
+ break;
+
+@@ -5191,7 +5191,7 @@ globus_i_gsc_recv(
+ if(user_cb != NULL)
+ {
+ user_cb(
+- op,
++ op,
+ op->server_handle->data_object->user_handle,
+ op->path,
+ op->mod_name,
+@@ -5321,9 +5321,9 @@ globus_gridftp_server_control_finished_auth(
+ {
+ globus_free(op->server_handle->default_cwd);
+ }
+- op->server_handle->default_cwd =
++ op->server_handle->default_cwd =
+ globus_libc_strdup(op->server_handle->cwd);
+-
++
+ op->response_type = response_code;
+ if(op->response_type == GLOBUS_GRIDFTP_SERVER_CONTROL_RESPONSE_SUCCESS)
+ {
+@@ -5371,14 +5371,14 @@ globus_gridftp_server_control_finished_resource(
+ {
+ globus_mutex_lock(&op->stat_lock);
+ }
+-
++
+ op->response_type = response_code;
+ op->response_msg = NULL;
+ if(msg != NULL)
+ {
+ op->response_msg = strdup(msg);
+ }
+-
++
+ if(res == GLOBUS_SUCCESS && op->stat_cb != NULL)
+ {
+ if(op->stat_info != NULL)
+@@ -5388,12 +5388,12 @@ globus_gridftp_server_control_finished_resource(
+ if(op->stat_info[ctr].name != NULL)
+ {
+ globus_free(op->stat_info[ctr].name);
+- }
++ }
+ if(op->stat_info[ctr].symlink_target != NULL)
+ {
+ globus_free(op->stat_info[ctr].symlink_target);
+ }
+- }
++ }
+ globus_free(op->stat_info);
+ }
+ op->stat_info = (globus_gridftp_server_control_stat_t *)
+@@ -5406,7 +5406,7 @@ globus_gridftp_server_control_finished_resource(
+ &op->stat_info[ctr], &stat_info_array[ctr]);
+ }
+ op->uid = uid;
+-
++
+ /* added gid stuff here, doesn't get pushed all the way through to
+ the cwd or mlsd funcs yet, but that is all internal api so easy
+ to change. */
+@@ -5417,11 +5417,11 @@ globus_gridftp_server_control_finished_resource(
+ op->gid_count = gid_count;
+ if(gid_count != 0 && gid_array != NULL)
+ {
+- op->gid_array = (int *)
++ op->gid_array = (int *)
+ globus_malloc(gid_count * sizeof(int));
+ memcpy(
+- op->gid_array,
+- gid_array,
++ op->gid_array,
++ gid_array,
+ gid_count * sizeof(int));
+ }
+ }
+@@ -5515,7 +5515,7 @@ globus_gridftp_server_control_finished_active_connect(
+
+ return GLOBUS_SUCCESS;
+ }
+-
++
+ globus_result_t
+ globus_gridftp_server_control_finished_passive_connect(
+ globus_gridftp_server_control_op_t op,
+@@ -5666,7 +5666,7 @@ error:
+ return result;
+ }
+
+-
++
+ globus_result_t
+ globus_gridftp_server_control_begin_transfer(
+ globus_gridftp_server_control_op_t op)
+@@ -5685,7 +5685,7 @@ globus_gridftp_server_control_begin_transfer(
+ op->type != GLOBUS_L_GSC_OP_TYPE_LIST &&
+ op->type != GLOBUS_L_GSC_OP_TYPE_NLST &&
+ op->type != GLOBUS_L_GSC_OP_TYPE_MLSD &&
+- op->type != GLOBUS_L_GSC_OP_TYPE_MLSR)
++ op->type != GLOBUS_L_GSC_OP_TYPE_MLSR)
+ {
+ return GlobusGridFTPServerErrorParameter("op");
+ }
+@@ -5736,7 +5736,7 @@ globus_gridftp_server_control_finished_transfer(
+ op->type != GLOBUS_L_GSC_OP_TYPE_LIST &&
+ op->type != GLOBUS_L_GSC_OP_TYPE_NLST &&
+ op->type != GLOBUS_L_GSC_OP_TYPE_MLSD &&
+- op->type != GLOBUS_L_GSC_OP_TYPE_MLSR)
++ op->type != GLOBUS_L_GSC_OP_TYPE_MLSR)
+ {
+ return GlobusGridFTPServerErrorParameter("op");
+ }
+@@ -5756,7 +5756,7 @@ globus_gridftp_server_control_finished_transfer(
+ switch(op->server_handle->data_object->state)
+ {
+ case GLOBUS_L_GSC_DATA_OBJ_INUSE:
+- op->server_handle->data_object->state =
++ op->server_handle->data_object->state =
+ GLOBUS_L_GSC_DATA_OBJ_READY;
+ break;
+
+@@ -5806,7 +5806,7 @@ globus_gridftp_server_control_set_paths(
+ op->absolute_path = strdup(absolute_path);
+ }
+ /* resolved_path ignored */
+-
++
+ GlobusGridFTPServerDebugExit();
+ return GLOBUS_SUCCESS;
+ }
+@@ -5846,7 +5846,7 @@ globus_gridftp_server_control_list_buffer_alloc(
+ return GlobusGridFTPServerErrorParameter("out_size");
+ }
+
+- if(strncmp("LIST:", fact_str, 5) == 0)
++ if(strncmp("LIST:", fact_str, 5) == 0)
+ {
+ const char * glob_match_str;
+ if(fact_str[5] == '\0')
+@@ -5906,7 +5906,7 @@ globus_gridftp_server_control_events_enable(
+ op->type != GLOBUS_L_GSC_OP_TYPE_LIST &&
+ op->type != GLOBUS_L_GSC_OP_TYPE_NLST &&
+ op->type != GLOBUS_L_GSC_OP_TYPE_MLSD &&
+- op->type != GLOBUS_L_GSC_OP_TYPE_MLSR)
++ op->type != GLOBUS_L_GSC_OP_TYPE_MLSR)
+ {
+ res = GlobusGridFTPServerErrorParameter("op");
+ goto error_param;
+diff --git a/gridftp/server-lib/src/globus_gridftp_server_control_commands.c b/gridftp/server-lib/src/globus_gridftp_server_control_commands.c
+index b3afb2b3c..04735d4ec 100644
+--- a/gridftp/server-lib/src/globus_gridftp_server_control_commands.c
++++ b/gridftp/server-lib/src/globus_gridftp_server_control_commands.c
+@@ -62,7 +62,7 @@ globus_l_gsc_cmd_stru(
+ globus_i_gsc_log(op->server_handle, full_command,
+ GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_OTHER);
+ tmp_ptr = cmd_a[1];
+- if((tmp_ptr[0] == 'f' || tmp_ptr[0] == 'F')
++ if((tmp_ptr[0] == 'f' || tmp_ptr[0] == 'F')
+ && tmp_ptr[1] == '\0')
+ {
+ globus_gsc_959_finished_command(op, _FSMSL("200 STRU F ok.\r\n"));
+@@ -130,7 +130,7 @@ globus_l_gsc_cmd_pbsz(
+
+ globus_i_gsc_log(op->server_handle, full_command,
+ GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_SECURITY);
+- if(strlen(cmd_a[1]) > 10 ||
++ if(strlen(cmd_a[1]) > 10 ||
+ (strlen(cmd_a[1]) == 10 && strcmp(cmd_a[1], "4294967296") >= 0))
+ {
+ msg = globus_common_create_string(_FSMSL("501 Bad value for PBSZ: %s\r\n"),
+@@ -364,7 +364,7 @@ globus_l_gsc_cmd_mdtm_cb(
+ code = 213;
+ msg = globus_common_create_string(
+ "%04d%02d%02d%02d%02d%02d",
+- tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
++ tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
+ }
+
+@@ -501,16 +501,16 @@ globus_l_gsc_cmd_lang(
+ {
+ char * lang = NULL;
+
+-
++
+ char * msg;
+
+ globus_i_gsc_log(op->server_handle, full_command,
+ GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_TRANSFER_STATE);
+ if (cmd_a[1]==NULL)
+ {
+- /*nothing specified after LANG, keep default*/
++ /*nothing specified after LANG, keep default*/
+ msg = globus_common_create_string(_FSMSL("200 lang set to %s.\r\n"), lang);
+- op->server_handle->lang = lang;
++ op->server_handle->lang = lang;
+ }
+ else
+ {
+@@ -523,21 +523,21 @@ globus_l_gsc_cmd_lang(
+ }
+ else
+ {
+- /*Check if it is a supported language*/
+- /*As internationalization continues, this will be discovered
+- * from configuration--hardcoded for now
+- */
+- if (strcmp(lang, "EN")==0)
+- {
++ /*Check if it is a supported language*/
++ /*As internationalization continues, this will be discovered
++ * from configuration--hardcoded for now
++ */
++ if (strcmp(lang, "EN")==0)
++ {
+ msg = globus_common_create_string(_FSMSL("200 lang set to %s.\r\n"), lang);
+ op->server_handle->lang = lang;
+- }
+- else
+- {
++ }
++ else
++ {
+ msg = globus_common_create_string(
+ _FSMSL("501 '%s' unrecognized language.\r\n"), full_command);
+ free(lang);
+- }
++ }
+ }
+ if(msg == NULL)
+ {
+@@ -807,7 +807,7 @@ globus_l_gsc_cmd_stat_cb(
+ }
+ else if((intptr_t) user_arg == GLOBUS_L_GSC_OP_TYPE_MLSD)
+ {
+- if(response_type ==
++ if(response_type ==
+ GLOBUS_GRIDFTP_SERVER_CONTROL_RESPONSE_PARTIAL_SUCCESS)
+ {
+ partial = GLOBUS_TRUE;
+@@ -818,19 +818,19 @@ globus_l_gsc_cmd_stat_cb(
+ code = 250;
+ }
+ tmp_ptr = globus_i_gsc_mlsx_line(
+- stat_info,
+- stat_count,
+- op->server_handle->opts.mlsx_fact_str,
++ stat_info,
++ stat_count,
++ op->server_handle->opts.mlsx_fact_str,
+ uid,
+ NULL,
+ abs_path,
+ GLOBUS_TRUE);
+ msg = globus_common_create_string(
+- _FSMSL("%d-Contents of %s\r\n%s%d End.\r\n"),
+- code,
+- op->path,
++ _FSMSL("%d-Contents of %s\r\n%s%d End.\r\n"),
++ code,
++ op->path,
+ tmp_ptr,
+- code);
++ code);
+ globus_free(tmp_ptr);
+ }
+ else
+@@ -1024,9 +1024,9 @@ globus_l_gsc_cmd_size_cb(
+ globus_gsc_959_finished_command(op, tmp_ptr);
+ globus_free(tmp_ptr);
+ globus_free(msg);
+-
++
+ return;
+-
++
+ err:
+ if(msg != NULL)
+ {
+@@ -1257,7 +1257,7 @@ globus_l_gsc_cmd_syst(
+
+ globus_i_gsc_log(op->server_handle, full_command,
+ GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_OTHER);
+-
++
+ globus_gsc_959_finished_command(op, "215 UNIX Type: L8\r\n");
+
+ return;
+@@ -1378,7 +1378,7 @@ globus_l_gsc_cmd_opts(
+ {
+ *tmp_ptr = toupper(*tmp_ptr);
+ }
+-
++
+ if(argc != 3)
+ {
+ msg = _FSMSL("500 OPTS failed.\r\n");
+@@ -1389,7 +1389,7 @@ globus_l_gsc_cmd_opts(
+ {
+ *tmp_ptr = tolower(*tmp_ptr);
+ }
+-
++
+ tmp_ptr = cmd_a[2];
+
+ msg = _FSMSL("500 OPTS failed.\r\n");
+@@ -1477,7 +1477,7 @@ globus_l_gsc_cmd_opts(
+ if(sscanf(tmp_ptr, "markers=%d;", &tmp_i) == 1)
+ {
+ char * freq_str = globus_common_create_string("%d", tmp_i);
+- op->server_handle->opts.retr_perf_frequency = tmp_i;
++ op->server_handle->opts.retr_perf_frequency = tmp_i;
+ globus_libc_setenv("GFS_RETR_MARKERS", freq_str, 1);
+ }
+ else
+@@ -1517,7 +1517,7 @@ globus_l_gsc_cmd_opts(
+ msg = _FSMSL("500 OPTS failed.\r\n");
+ }
+ }
+- else if(strcmp("PASV", cmd_a[1]) == 0 ||
++ else if(strcmp("PASV", cmd_a[1]) == 0 ||
+ strcmp("SPAS", cmd_a[1]) == 0 ||
+ strcmp("EPSV", cmd_a[1]) == 0)
+ {
+@@ -1535,12 +1535,12 @@ globus_l_gsc_cmd_opts(
+ msg = _FSMSL("500 OPTS failed.\r\n");
+ }
+ }
+- else if(strcmp("MLST", cmd_a[1]) == 0 ||
++ else if(strcmp("MLST", cmd_a[1]) == 0 ||
+ strcmp("MLSD", cmd_a[1]) == 0 ||
+ strcmp("MLSR", cmd_a[1]) == 0)
+ {
+ globus_bool_t mlsr_options = GLOBUS_FALSE;
+-
++
+ for(tmp_ptr = cmd_a[2]; *tmp_ptr != '\0'; tmp_ptr++)
+ {
+ *tmp_ptr = tolower(*tmp_ptr);
+@@ -1552,22 +1552,22 @@ globus_l_gsc_cmd_opts(
+ {
+ opts->mlsr_traversal_options |= GLOBUS_GFS_TRAVERSAL_CONTINUE;
+ mlsr_options = GLOBUS_TRUE;
+- }
++ }
+ else if(strstr(cmd_a[2], "onerror=fail"))
+ {
+ opts->mlsr_traversal_options &= ~GLOBUS_GFS_TRAVERSAL_CONTINUE;
+ mlsr_options = GLOBUS_TRUE;
+- }
++ }
+ if(strstr(cmd_a[2], "traversesymboliclinks=true"))
+ {
+ opts->mlsr_traversal_options |= GLOBUS_GFS_TRAVERSAL_FOLLOW_SYMLINKS;
+ mlsr_options = GLOBUS_TRUE;
+- }
++ }
+ else if(strstr(cmd_a[2], "traversesymboliclinks=false"))
+ {
+ opts->mlsr_traversal_options &= ~GLOBUS_GFS_TRAVERSAL_FOLLOW_SYMLINKS;
+ mlsr_options = GLOBUS_TRUE;
+- }
++ }
+ }
+ /** Parse out common options */
+ tmp_ptr = opts->mlsx_fact_str;
+@@ -1625,7 +1625,7 @@ globus_l_gsc_cmd_opts(
+ {
+ *tmp_ptr = GLOBUS_GSX_MLSX_FACT_UNIXUID;
+ tmp_ptr++;
+- }
++ }
+ if(strstr(cmd_a[2], "unix.gid"))
+ {
+ *tmp_ptr = GLOBUS_GSX_MLSX_FACT_UNIXGID;
+@@ -1786,7 +1786,7 @@ globus_l_gsc_cmd_site_fault(
+ {
+ int len;
+ int ctr;
+-
++
+ globus_i_gsc_log(op->server_handle, full_command,
+ GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_SITE);
+
+@@ -1799,10 +1799,10 @@ globus_l_gsc_cmd_site_fault(
+ len = strlen(op->server_handle->fault_cmd);
+ for(ctr = 0; ctr < len; ctr++)
+ {
+- op->server_handle->fault_cmd[ctr] =
++ op->server_handle->fault_cmd[ctr] =
+ toupper(op->server_handle->fault_cmd[ctr]);
+ }
+-
++
+ globus_gsc_959_finished_command(
+ op, "200 Site Command Successful.\r\n");
+
+@@ -1845,8 +1845,8 @@ globus_l_gsc_cmd_rest(
+ tmp_ptr = cmd_a[1];
+ while(tmp_ptr != NULL)
+ {
+- sc = sscanf(tmp_ptr,
+- "%"GLOBUS_OFF_T_FORMAT"-%"GLOBUS_OFF_T_FORMAT,
++ sc = sscanf(tmp_ptr,
++ "%"GLOBUS_OFF_T_FORMAT"-%"GLOBUS_OFF_T_FORMAT,
+ &start_offset, &end_offset);
+ if(sc != 2)
+ {
+@@ -1870,7 +1870,7 @@ globus_l_gsc_cmd_rest(
+ globus_range_list_destroy(op->server_handle->range_list);
+ }
+ op->server_handle->range_list = range_list;
+- globus_gsc_959_finished_command(op,
++ globus_gsc_959_finished_command(op,
+ _FSMSL("350 Restart Marker OK. Send STORE or RETR to initiate transfer.\r\n"));
+ }
+
+@@ -1911,7 +1911,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_code = 534;
+ err_msg = "Data connection auth error";
+ break;
+-
++
+ default:
+ if (globus_l_gsc_is_ftp_code(response_type))
+ {
+@@ -1942,7 +1942,7 @@ globus_l_gsc_cmd_pasv_cb(
+ if(globus_libc_contact_string_to_ints(
+ cs[0], host_ip, &ip_count, &port) != GLOBUS_SUCCESS)
+ {
+- err_code = 500;
++ err_code = 500;
+ err_msg = "Resource error.\r\n";
+ goto err;
+ }
+@@ -1952,7 +1952,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Network protocol not supported.\r\n";
+ goto err;
+ }
+-
++
+ msg = globus_common_create_string(
+ "%d Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n",
+ wrapper->reply_code,
+@@ -1971,7 +1971,7 @@ globus_l_gsc_cmd_pasv_cb(
+ addr_count = 1;
+ }
+ msg = globus_common_create_string(
+- "%d-Entering Striped Passive Mode.\r\n",
++ "%d-Entering Striped Passive Mode.\r\n",
+ wrapper->reply_code);
+ for(ctr = 0; ctr < addr_count; ctr++)
+ {
+@@ -1988,7 +1988,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Network protocol not supported.\r\n";
+ goto err;
+ }
+-
++
+ tmp_ptr = globus_common_create_string(
+ "%s %d,%d,%d,%d,%d,%d\r\n",
+ msg,
+@@ -2007,7 +2007,7 @@ globus_l_gsc_cmd_pasv_cb(
+ globus_free(msg);
+ msg = tmp_ptr;
+ }
+- tmp_ptr = globus_common_create_string("%s%d End\r\n",
++ tmp_ptr = globus_common_create_string("%s%d End\r\n",
+ msg, wrapper->reply_code);
+ if(tmp_ptr == NULL)
+ {
+@@ -2026,7 +2026,7 @@ globus_l_gsc_cmd_pasv_cb(
+ {
+ char * p;
+ char * h;
+-
++
+ host = globus_libc_strdup(cs[0]);
+ if(!host)
+ {
+@@ -2034,7 +2034,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Resource error.\r\n";
+ goto err;
+ }
+-
++
+ p = strrchr(host, ':');
+ if(!p || p == host)
+ {
+@@ -2043,7 +2043,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Internal Parse error.\r\n";
+ goto err;
+ }
+-
++
+ h = host;
+ if(*host == '[')
+ {
+@@ -2060,7 +2060,7 @@ globus_l_gsc_cmd_pasv_cb(
+ *p = 0;
+ }
+ p++;
+-
++
+ sc = sscanf(p, "%hu", &port);
+ if(sc != 1)
+ {
+@@ -2069,7 +2069,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Internal Parse error.\r\n";
+ goto err;
+ }
+-
++
+ if(op->server_handle->epsv_ip)
+ {
+ msg = globus_common_create_string(
+@@ -2083,7 +2083,7 @@ globus_l_gsc_cmd_pasv_cb(
+ {
+ msg = globus_common_create_string(
+ "%d Entering Extended Passive Mode (|||%d|)\r\n",
+- wrapper->reply_code,
++ wrapper->reply_code,
+ (int) port);
+ }
+ globus_free(host);
+@@ -2101,7 +2101,7 @@ globus_l_gsc_cmd_pasv_cb(
+ {
+ char * p;
+ char * h;
+-
++
+ host = globus_libc_strdup(cs[ctr]);
+ if(!host)
+ {
+@@ -2109,7 +2109,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Resource error.\r\n";
+ goto err;
+ }
+-
++
+ p = strrchr(host, ':');
+ if(!p || p == host)
+ {
+@@ -2118,7 +2118,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Internal Parse error.\r\n";
+ goto err;
+ }
+-
++
+ h = host;
+ if(*cs[0] == '[')
+ {
+@@ -2130,7 +2130,7 @@ globus_l_gsc_cmd_pasv_cb(
+ *p = 0;
+ }
+ p++;
+-
++
+ sc = sscanf(p, "%hu", &port);
+ if(sc != 1)
+ {
+@@ -2139,7 +2139,7 @@ globus_l_gsc_cmd_pasv_cb(
+ err_msg = "Internal Parse error.\r\n";
+ goto err;
+ }
+-
++
+ tmp_ptr = globus_common_create_string(
+ "%s |%d|%s|%d|\r\n",
+ msg,
+@@ -2156,7 +2156,7 @@ globus_l_gsc_cmd_pasv_cb(
+ globus_free(msg);
+ msg = tmp_ptr;
+ }
+- tmp_ptr = globus_common_create_string("%s%d End\r\n",
++ tmp_ptr = globus_common_create_string("%s%d End\r\n",
+ msg, wrapper->reply_code);
+ if(tmp_ptr == NULL)
+ {
+@@ -2283,7 +2283,7 @@ globus_l_gsc_cmd_pasv(
+ }
+ }
+ }
+-
++
+ wrapper->reply_code = 229;
+ wrapper->cmd_ndx = 2;
+ }
+@@ -2293,7 +2293,7 @@ globus_l_gsc_cmd_pasv(
+ wrapper->cmd_ndx = 3;
+ wrapper->reply_code = 229;
+ wrapper->prt = GLOBUS_GRIDFTP_SERVER_CONTROL_PROTOCOL_IPV4;
+-
++
+ /* optional 2nd argument similar to epsv */
+ if(argc == 2)
+ {
+@@ -2368,7 +2368,7 @@ globus_l_gsc_cmd_port_cb(
+ code = 534;
+ msg = strdup("Data connection auth error");
+ break;
+-
++
+ default:
+ if (globus_l_gsc_is_ftp_code(response_type))
+ {
+@@ -2451,7 +2451,7 @@ globus_l_gsc_cmd_port(
+ else if(strcmp(cmd_a[0], "SPOR") == 0)
+ {
+ wrapper->max = -1;
+-
++
+ stripe_count = 1; /* for the first */
+ p = cmd_a[1];
+ while((p = strchr(p, ' ')))
+@@ -2469,13 +2469,13 @@ globus_l_gsc_cmd_port(
+ {
+ globus_assert(GLOBUS_FALSE);
+ }
+-
++
+ contact_strings = globus_libc_calloc(stripe_count, sizeof(char *));
+ if(contact_strings == NULL)
+ {
+ goto err;
+ }
+-
++
+ /* move to the first command argument */
+ p = cmd_a[1];
+ while(isspace(*p)) p++;
+@@ -2483,7 +2483,7 @@ globus_l_gsc_cmd_port(
+ {
+ delim = 0;
+ }
+-
++
+ for(i = 0; i < stripe_count && *p; i++)
+ {
+ if(delim)
+@@ -2498,11 +2498,11 @@ globus_l_gsc_cmd_port(
+ /* get prt portion */
+ if(sscanf(p, "%d", &sc) < 1 || (sc != 1 && sc != 2))
+ {
+- msg =
++ msg =
+ "522 Network protocol not supported, use (1,2).\r\n";
+ break;
+ }
+-
++
+ /* may need to handle mixed prt in striped mode */
+ if(sc == 1)
+ {
+@@ -2514,7 +2514,7 @@ globus_l_gsc_cmd_port(
+ wrapper->prt =
+ GLOBUS_GRIDFTP_SERVER_CONTROL_PROTOCOL_IPV6;
+ }
+-
++
+ while(*p && *p != delim) p++;
+ }
+ else
+@@ -2523,18 +2523,18 @@ globus_l_gsc_cmd_port(
+ break;
+ }
+ }
+-
++
+ if(*p)
+ {
+ int j = 0;
+ char * s;
+ char * c;
+ char buf[100];
+-
++
+ p++;
+ c = strchr(p, ':');
+ s = strchr(p, delim);
+-
++
+ if(*p != delim)
+ {
+ /* get ip portion */
+@@ -2542,12 +2542,12 @@ globus_l_gsc_cmd_port(
+ {
+ buf[j++] = '[';
+ }
+-
++
+ while(j < sizeof(buf) - 1 && p < s)
+ {
+ buf[j++] = *(p++);
+ }
+-
++
+ /* need room for ], :, 5 digits, and nul */
+ if(*p == delim && j + 7 < sizeof(buf))
+ {
+@@ -2557,7 +2557,7 @@ globus_l_gsc_cmd_port(
+ {
+ buf[j++] = ']';
+ }
+-
++
+ buf[j++] = ':';
+ while(j < sizeof(buf) - 1 &&
+ isdigit(*p) && *p != delim)
+@@ -2573,9 +2573,9 @@ globus_l_gsc_cmd_port(
+ msg = "501 Malformed argument.\r\n";
+ break;
+ }
+-
++
+ buf[j] = 0;
+-
++
+ contact_strings[i] = globus_libc_strdup(buf);
+ }
+ else
+@@ -2594,11 +2594,11 @@ globus_l_gsc_cmd_port(
+ else
+ {
+ int consumed;
+-
++
+ wrapper->prt = GLOBUS_GRIDFTP_SERVER_CONTROL_PROTOCOL_IPV4;
+-
++
+ while(*p && !isdigit(*p)) p++;
+-
++
+ sc = sscanf(p,
+ "%u,%u,%u,%u,%u,%u%n",
+ &host_ip[0],
+@@ -2635,7 +2635,7 @@ globus_l_gsc_cmd_port(
+ p += consumed;
+ }
+ }
+-
++
+ if(!contact_strings[i])
+ {
+ msg = _FSMSL("501 Resource error.\r\n");
+@@ -2689,7 +2689,7 @@ globus_l_gsc_cmd_port(
+ * ------------------
+ ************************************************************************/
+
+-static void
++static void
+ globus_l_gsc_data_cb(
+ globus_i_gsc_op_t * op,
+ globus_gridftp_server_control_response_t response_type,
+@@ -2788,7 +2788,7 @@ globus_l_gsc_cmd_transfer(
+ globus_l_gsc_data_cb,
+ wrapper);
+ break;
+-
++
+ default:
+ globus_assert(GLOBUS_FALSE);
+ break;
+@@ -2837,7 +2837,7 @@ globus_l_gsc_cmd_stor_retr_cb(
+
+ wrapper = (globus_i_gsc_cmd_wrapper_t *) user_arg;
+ wrapper->op = op;
+- wrapper->path = globus_libc_strdup(path);
++ wrapper->path = globus_libc_strdup(path);
+
+ if(response_type == GLOBUS_GRIDFTP_SERVER_CONTROL_RESPONSE_SUCCESS &&
+ stat_count > 1)
+@@ -2846,13 +2846,13 @@ globus_l_gsc_cmd_stor_retr_cb(
+ msg = globus_common_create_string(
+ _FSMSL("Path is a directory."));
+ }
+-
++
+ if(response_type != GLOBUS_GRIDFTP_SERVER_CONTROL_RESPONSE_SUCCESS ||
+ stat_count < 1)
+ {
+ /* we'll mimic a STOR here since the file doesn't exist */
+ wrapper->mod_name = NULL;
+- wrapper->mod_parms = NULL;
++ wrapper->mod_parms = NULL;
+ }
+ else
+ {
+@@ -2861,7 +2861,7 @@ globus_l_gsc_cmd_stor_retr_cb(
+ wrapper->mod_parms = globus_common_create_string(
+ "%"GLOBUS_OFF_T_FORMAT, stat_info->size);
+ }
+-
++
+ if(msg != NULL)
+ {
+ tmp_ptr = globus_gsc_string_to_959(code, msg, NULL);
+@@ -2899,7 +2899,7 @@ globus_l_gsc_cmd_stor_retr_cb(
+ globus_l_gsc_cmd_transfer(wrapper);
+ }
+ return;
+-
++
+ }
+
+ /*
+@@ -2981,7 +2981,7 @@ globus_l_gsc_cmd_stor_retr(
+ }
+ else if(strcmp(cmd_a[0], "APPE") == 0)
+ {
+- int mask =
++ int mask =
+ GLOBUS_GRIDFTP_SERVER_CONTROL_RESOURCE_FILE_ONLY;
+
+ res = globus_i_gsc_resource_query(
+@@ -3007,8 +3007,8 @@ globus_l_gsc_cmd_stor_retr(
+ arg2 = cmd_a[1] + 2;
+ while(isspace(*arg2) && *arg2 != '\0') arg2++;
+
+- sc = sscanf(arg2,
+- "%"GLOBUS_OFF_T_FORMAT" %"GLOBUS_OFF_T_FORMAT,
++ sc = sscanf(arg2,
++ "%"GLOBUS_OFF_T_FORMAT" %"GLOBUS_OFF_T_FORMAT,
+ &tmp_o, &tmp_o);
+ if(sc != 2)
+ {
+@@ -3097,7 +3097,7 @@ globus_l_gsc_cmd_stor_retr(
+ globus_free(wrapper);
+ globus_gsc_959_finished_command(op, _FSMSL("500 command failed: space.\r\n"));
+ return;
+- }
++ }
+ *tmp_ptr = '\0';
+ if(tmp_ptr[1] == '\0' || tmp_ptr[2] == '\0')
+ {
+@@ -3137,8 +3137,8 @@ globus_l_gsc_cmd_stor_retr(
+ tmp_ptr++;
+ }
+ }
+-
+- if((*tmp_ptr == '*' && *(tmp_ptr + 1) == '\0') ||
++
++ if((*tmp_ptr == '*' && *(tmp_ptr + 1) == '\0') ||
+ *tmp_ptr == '\0')
+ {
+ path = globus_libc_strdup(op->server_handle->cwd);
+@@ -3147,14 +3147,14 @@ globus_l_gsc_cmd_stor_retr(
+ {
+ int len;
+ char * fn_ptr;
+-
++
+ len = strlen(tmp_ptr);
+ if(strcspn(tmp_ptr, "[]*?") == len)
+ {
+ path = globus_libc_strdup(tmp_ptr);
+ }
+ else
+- {
++ {
+ if((fn_ptr = strrchr(tmp_ptr, '/')) != NULL)
+ {
+ fn_ptr++;
+@@ -3232,7 +3232,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "ALLO",
++ "ALLO",
+ globus_l_gsc_cmd_allo,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3242,7 +3242,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "APPE",
++ "APPE",
+ globus_l_gsc_cmd_stor_retr,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3252,7 +3252,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "CWD",
++ "CWD",
+ globus_l_gsc_cmd_cwd,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3262,7 +3262,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "CDUP",
++ "CDUP",
+ globus_l_gsc_cmd_cwd,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3272,7 +3272,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "DCAU",
++ "DCAU",
+ globus_l_gsc_cmd_dcau,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3282,7 +3282,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "EPSV",
++ "EPSV",
+ globus_l_gsc_cmd_pasv,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3292,7 +3292,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "ERET",
++ "ERET",
+ globus_l_gsc_cmd_stor_retr,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3302,7 +3302,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "ESTO",
++ "ESTO",
+ globus_l_gsc_cmd_stor_retr,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3312,9 +3312,9 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "FEAT",
++ "FEAT",
+ globus_l_gsc_cmd_feat,
+- GLOBUS_GSC_COMMAND_PRE_AUTH |
++ GLOBUS_GSC_COMMAND_PRE_AUTH |
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+ 1,
+@@ -3323,9 +3323,9 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "HELP",
++ "HELP",
+ globus_l_gsc_cmd_help,
+- GLOBUS_GSC_COMMAND_PRE_AUTH |
++ GLOBUS_GSC_COMMAND_PRE_AUTH |
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+ 2,
+@@ -3334,7 +3334,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "LIST",
++ "LIST",
+ globus_l_gsc_cmd_stor_retr,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3344,7 +3344,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "MDTM",
++ "MDTM",
+ globus_l_gsc_cmd_mdtm,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3354,7 +3354,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "MODE",
++ "MODE",
+ globus_l_gsc_cmd_mode,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3364,7 +3364,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "NLST",
++ "NLST",
+ globus_l_gsc_cmd_stor_retr,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3414,9 +3414,9 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "NOOP",
++ "NOOP",
+ globus_l_gsc_cmd_noop,
+- GLOBUS_GSC_COMMAND_PRE_AUTH |
++ GLOBUS_GSC_COMMAND_PRE_AUTH |
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+ 1,
+@@ -3425,7 +3425,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "OPTS",
++ "OPTS",
+ globus_l_gsc_cmd_opts,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3435,7 +3435,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "PASS",
++ "PASS",
+ globus_l_gsc_cmd_pass,
+ GLOBUS_GSC_COMMAND_PRE_AUTH,
+ 1,
+@@ -3445,7 +3445,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "PASV",
++ "PASV",
+ globus_l_gsc_cmd_pasv,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3455,7 +3455,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "PBSZ",
++ "PBSZ",
+ globus_l_gsc_cmd_pbsz,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3465,7 +3465,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "PORT",
++ "PORT",
+ globus_l_gsc_cmd_port,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3475,7 +3475,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "PROT",
++ "PROT",
+ globus_l_gsc_cmd_prot,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3485,7 +3485,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "EPRT",
++ "EPRT",
+ globus_l_gsc_cmd_port,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3495,7 +3495,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SPOR",
++ "SPOR",
+ globus_l_gsc_cmd_port,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3505,7 +3505,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "TREV",
++ "TREV",
+ globus_l_gsc_cmd_trev,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3515,7 +3515,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "PWD",
++ "PWD",
+ globus_l_gsc_cmd_pwd,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3525,9 +3525,9 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "QUIT",
++ "QUIT",
+ globus_l_gsc_cmd_quit,
+- GLOBUS_GSC_COMMAND_PRE_AUTH |
++ GLOBUS_GSC_COMMAND_PRE_AUTH |
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+ 1,
+@@ -3536,7 +3536,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "REST",
++ "REST",
+ globus_l_gsc_cmd_rest,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3546,7 +3546,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "RETR",
++ "RETR",
+ globus_l_gsc_cmd_stor_retr,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3556,7 +3556,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SBUF",
++ "SBUF",
+ globus_l_gsc_cmd_sbuf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3566,7 +3566,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SIZE",
++ "SIZE",
+ globus_l_gsc_cmd_size,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3576,7 +3576,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SPAS",
++ "SPAS",
+ globus_l_gsc_cmd_pasv,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3586,7 +3586,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "STAT",
++ "STAT",
+ globus_l_gsc_cmd_stat,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3596,7 +3596,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "STOR",
++ "STOR",
+ globus_l_gsc_cmd_stor_retr,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3606,7 +3606,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "STRU",
++ "STRU",
+ globus_l_gsc_cmd_stru,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3616,7 +3616,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SYST",
++ "SYST",
+ globus_l_gsc_cmd_syst,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+@@ -3626,7 +3626,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "TYPE",
++ "TYPE",
+ globus_l_gsc_cmd_type,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+@@ -3636,7 +3636,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "USER",
++ "USER",
+ globus_l_gsc_cmd_user,
+ GLOBUS_GSC_COMMAND_PRE_AUTH,
+ 2,
+@@ -3646,7 +3646,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE SBUF",
++ "SITE SBUF",
+ globus_l_gsc_cmd_site_sbuf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3656,7 +3656,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE RETRBUFSIZE",
++ "SITE RETRBUFSIZE",
+ globus_l_gsc_cmd_site_receive_buf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3666,7 +3666,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE RBUFSZ",
++ "SITE RBUFSZ",
+ globus_l_gsc_cmd_site_receive_buf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3676,7 +3676,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE RBUFSIZ",
++ "SITE RBUFSIZ",
+ globus_l_gsc_cmd_site_receive_buf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3686,7 +3686,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE STORBUFSIZE",
++ "SITE STORBUFSIZE",
+ globus_l_gsc_cmd_site_send_buf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3696,7 +3696,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE SBUFSZ",
++ "SITE SBUFSZ",
+ globus_l_gsc_cmd_site_send_buf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3706,7 +3706,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE SBUFSIZ",
++ "SITE SBUFSIZ",
+ globus_l_gsc_cmd_site_send_buf,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3716,9 +3716,9 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE HELP",
++ "SITE HELP",
+ globus_l_gsc_cmd_help,
+- GLOBUS_GSC_COMMAND_PRE_AUTH |
++ GLOBUS_GSC_COMMAND_PRE_AUTH |
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 2,
+ 3,
+@@ -3727,7 +3727,7 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "SITE FAULT",
++ "SITE FAULT",
+ globus_l_gsc_cmd_site_fault,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 3,
+@@ -3737,14 +3737,14 @@ globus_i_gsc_add_commands(
+
+ globus_gsc_959_command_add(
+ server_handle,
+- "LANG",
++ "LANG",
+ globus_l_gsc_cmd_lang,
+ GLOBUS_GSC_COMMAND_POST_AUTH,
+ 1,
+ 2,
+ "LANG: set language for messages",
+ NULL);
+-
++
+ /* add features */
+ globus_gridftp_server_control_add_feature(server_handle, "PASV AllowDelayed;");
+ globus_gridftp_server_control_add_feature(server_handle, "MDTM");
+@@ -3753,11 +3753,11 @@ globus_i_gsc_add_commands(
+ globus_gridftp_server_control_add_feature(server_handle, "SPAS");
+ globus_gridftp_server_control_add_feature(server_handle, "ESTO");
+ globus_gridftp_server_control_add_feature(server_handle, "ERET");
+- globus_gridftp_server_control_add_feature(server_handle, "MLST Type*;Size*;Modify*;Perm*;Charset;UNIX.mode*;UNIX.owner*;UNIX.uid*;UNIX.group*;UNIX.gid*;Unique*;UNIX.slink*;X.count;");
+- globus_gridftp_server_control_add_feature(server_handle, "SIZE");
+- globus_gridftp_server_control_add_feature(server_handle, "PARALLEL");
+- globus_gridftp_server_control_add_feature(server_handle, "DCAU");
+- globus_gridftp_server_control_add_feature(server_handle, "LANG EN");
++ globus_gridftp_server_control_add_feature(server_handle, "MLST Type*;Size*;Modify*;Perm*;Charset;UNIX.mode*;UNIX.owner*;UNIX.uid*;UNIX.group*;UNIX.gid*;Unique*;UNIX.slink*;X.count;");
++ globus_gridftp_server_control_add_feature(server_handle, "SIZE");
++ globus_gridftp_server_control_add_feature(server_handle, "PARALLEL");
++ globus_gridftp_server_control_add_feature(server_handle, "DCAU");
++ globus_gridftp_server_control_add_feature(server_handle, "LANG EN");
+ globus_gridftp_server_control_add_feature(server_handle, "UTF8");
+ globus_gridftp_server_control_add_feature(server_handle, "MLSC");
+ globus_gridftp_server_control_add_feature(server_handle, "MLSR");
+diff --git a/gridftp/server-lib/src/globus_xio_gssapi_ftp.c b/gridftp/server-lib/src/globus_xio_gssapi_ftp.c
+index c41674ba2..b55d4a3e0 100644
+--- a/gridftp/server-lib/src/globus_xio_gssapi_ftp.c
++++ b/gridftp/server-lib/src/globus_xio_gssapi_ftp.c
+@@ -35,7 +35,7 @@
+ _xio_name, \
+ __LINE__, \
+ "Bad Parameter"))
+-
++
+ #define GlobusXIOGssapiFTPOutstandingOp() \
+ globus_error_put( \
+ globus_error_construct_error( \
+@@ -46,7 +46,7 @@
+ _xio_name, \
+ __LINE__, \
+ "Operation is outstanding"))
+-
++
+ #define GlobusXIOGssapiFTPEncodingError() \
+ globus_error_put( \
+ globus_error_construct_error( \
+@@ -57,7 +57,7 @@
+ _xio_name, \
+ __LINE__, \
+ "Error encoding."))
+-
++
+ #define GlobusXIOGssapiFTPAllocError() \
+ globus_error_put( \
+ globus_error_construct_error( \
+@@ -92,7 +92,7 @@
+ _xio_name, \
+ __LINE__, \
+ failure))
+-
++
+ #define GlobusXIOGssapiFTPAuthenticationFailure(str) \
+ globus_error_put( \
+ globus_error_construct_error( \
+@@ -104,7 +104,7 @@
+ __LINE__, \
+ "Authentication Error: %s", \
+ str))
+-
++
+ #define GlobusXIOGssapiFTPQuit() \
+ globus_error_put( \
+ globus_error_construct_error( \
+@@ -221,16 +221,16 @@ static globus_xio_driver_t globus_l_gssapi_telnet_driver = NULL;
+ static char globus_l_xio_gssapi_ftp_pad = '=';
+ static char * globus_l_xio_gssapi_ftp_radix_n =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+-
++
+ /**************************************************************************
+- * data type definitions
++ * data type definitions
+ * ---------------------
+ *************************************************************************/
+
+ /**
+ * opening
+ * -------
+- * When a user opens a handle the authentication process begins. The
++ * When a user opens a handle the authentication process begins. The
+ * default case will do the entire authentication processes as described
+ * in the state machine. However the user can override various bits
+ * of the authentication process by setting the start state on the handle
+@@ -239,11 +239,11 @@ static char * globus_l_xio_gssapi_ftp_radix_n =
+ /*
+ * writting
+ * --------
+- * Once an open handle is esstablished the user may post writes. If
++ * Once an open handle is esstablished the user may post writes. If
+ * a write is posted that does not contain a complete command (no \r\n)
+ * then it is copied to an internal buffer and the user is told that the
+ * write operation is complete. As soon as a complete comman is received
+- * it is wrapped and encoded then passed down the stack. Additional
++ * it is wrapped and encoded then passed down the stack. Additional
+ * data beyound a complete command is cached in the same way.
+ */
+
+@@ -418,7 +418,7 @@ globus_l_xio_gssapi_ftp_handle_create()
+ /*
+ * create a new handle and initialize it
+ */
+- handle = (globus_l_xio_gssapi_ftp_handle_t *)
++ handle = (globus_l_xio_gssapi_ftp_handle_t *)
+ globus_libc_calloc(sizeof(globus_l_xio_gssapi_ftp_handle_t), 1);
+ if(handle == NULL)
+ {
+@@ -521,7 +521,7 @@ globus_l_xio_gssapi_ftp_radix_decode(
+ {
+ if ((p = strchr(globus_l_xio_gssapi_ftp_radix_n, inbuf[i])) == NULL)
+ {
+- goto err;
++ goto err;
+ }
+ D = p - globus_l_xio_gssapi_ftp_radix_n;
+ switch (i&3)
+@@ -548,27 +548,27 @@ globus_l_xio_gssapi_ftp_radix_decode(
+ switch (i&3)
+ {
+ case 1:
+- goto err;
+-
++ goto err;
++
+ case 2:
+ if (D&15)
+ {
+- goto err;
++ goto err;
+ }
+ if (strcmp((char *)&inbuf[i], "=="))
+ {
+- goto err;
++ goto err;
+ }
+ break;
+
+ case 3:
+ if (D&3)
+ {
+- goto err;
++ goto err;
+ }
+ if (strcmp((char *)&inbuf[i], "="))
+ {
+- goto err;
++ goto err;
+ }
+ break;
+
+@@ -759,7 +759,7 @@ globus_l_xio_gssapi_ftp_decode_adat(
+ /* if we have finished the security exchange */
+ case GSS_S_COMPLETE:
+ /* get the subject and copy into handle */
+-
++
+ maj_stat = gss_display_name(
+ &min_stat,
+ handle->target_name,
+@@ -954,7 +954,7 @@ globus_l_xio_gssapi_ftp_parse_command(
+ sub_len -= 4;
+ }
+ /* feat is returning continuation commands that look strabge
+- this allows it to work, but TODO: verifiy server is
++ this allows it to work, but TODO: verifiy server is
+ correct */
+ else
+ {
+@@ -1002,8 +1002,8 @@ err:
+ }
+
+ /*
+- * take a wrapped buffer and decode and unwrap it. The caller is
+- * responsible for freeing the out buffer if the function returns
++ * take a wrapped buffer and decode and unwrap it. The caller is
++ * responsible for freeing the out buffer if the function returns
+ * successfully.
+ */
+ static globus_result_t
+@@ -1062,9 +1062,9 @@ globus_l_xio_gssapi_ftp_unwrap(
+ globus_free(buf);
+ goto err;
+ }
+-
++
+ globus_free(buf);
+-
++
+ /* copy the unwrapped token in */
+ len = unwrapped_token.length;
+ buf = globus_malloc(len+3);
+@@ -1106,7 +1106,7 @@ globus_l_xio_gssapi_ftp_unwrap(
+ static globus_result_t
+ globus_l_xio_gssapi_ftp_wrap(
+ globus_l_xio_gssapi_ftp_handle_t * handle,
+- globus_byte_t * in_buf,
++ globus_byte_t * in_buf,
+ globus_size_t length,
+ void ** out_buffer,
+ globus_size_t * out_len,
+@@ -1125,7 +1125,7 @@ globus_l_xio_gssapi_ftp_wrap(
+
+ gss_in_buf.value = in_buf;
+ gss_in_buf.length = length;
+-
++
+ maj_stat = gss_wrap(&min_stat,
+ handle->gssapi_context,
+ 0,
+@@ -1139,7 +1139,7 @@ globus_l_xio_gssapi_ftp_wrap(
+ goto err;
+ }
+
+- encoded_buf = (char *)
++ encoded_buf = (char *)
+ globus_libc_malloc((gss_out_buf.length + 3) * 8 / 6 + 9);
+ if(encoded_buf == NULL)
+ {
+@@ -1195,10 +1195,10 @@ globus_l_xio_gssapi_ftp_wrap(
+ }
+
+ /* preline only affects multiline strings.
+- a null preline will prepend a "code-" to the front of each line by default,
++ a null preline will prepend a "code-" to the front of each line by default,
+ otherwise the preline is prepended.
+ */
+-static
++static
+ char *
+ globus_l_xio_gssapi_ftp_string_to_959(
+ int code,
+@@ -1251,8 +1251,8 @@ globus_l_xio_gssapi_ftp_string_to_959(
+
+ tmp_ptr = msg;
+ msg = globus_common_create_string(
+- "%s%s%s\r\n",
+- tmp_ptr,
++ "%s%s%s\r\n",
++ tmp_ptr,
+ (ctr > 0) ? prepad : "",
+ start_ptr);
+ globus_free(tmp_ptr);
+@@ -1283,7 +1283,7 @@ globus_l_xio_gssapi_ftp_string_to_959(
+ * server open
+ * -----------
+ *
+- * This section contains the functions used by a server in openning
++ * This section contains the functions used by a server in openning
+ * a handle.
+ ***********************************************************************/
+ /*
+@@ -1370,7 +1370,7 @@ globus_l_xio_gssapi_ftp_server_read_cb(
+ msg = globus_libc_strdup(REPLY_530_EXPECTING_ADAT);
+ }
+ }
+- else if(cmd_a[1] == NULL ||
++ else if(cmd_a[1] == NULL ||
+ strcasecmp(cmd_a[1], "GSSAPI") != 0)
+ {
+ msg = globus_libc_strdup(REPLY_504_BAD_AUTH_TYPE);
+@@ -1492,9 +1492,9 @@ globus_l_xio_gssapi_ftp_server_read_cb(
+ handle->auth_write_iov.iov_len = globus_libc_strlen(msg);
+ GlobusXIOGssapiftpDebugPassWrite();
+ res = globus_xio_driver_pass_write(
+- op,
++ op,
+ &handle->auth_write_iov,
+- 1,
++ 1,
+ handle->auth_write_iov.iov_len,
+ globus_l_xio_gssapi_ftp_auth_server_write_cb,
+ handle);
+@@ -1529,8 +1529,8 @@ globus_l_xio_gssapi_ftp_server_read_cb(
+
+ /*
+ * while in the open authentication process, this callback is used for
+- * all of the writes.
+- */
++ * all of the writes.
++ */
+ static void
+ globus_l_xio_gssapi_ftp_auth_server_write_cb(
+ globus_xio_operation_t op,
+@@ -1580,7 +1580,7 @@ globus_l_xio_gssapi_ftp_auth_server_write_cb(
+ break;
+
+ case GSSAPI_FTP_STATE_SERVER_ADAT_REPLY:
+- GlobusXIOGssapiftpDebugChangeState(handle,
++ GlobusXIOGssapiftpDebugChangeState(handle,
+ GSSAPI_FTP_STATE_OPEN);
+ break;
+
+@@ -1620,8 +1620,8 @@ globus_l_xio_gssapi_ftp_auth_server_write_cb(
+ }
+ /*
+ * while in the open authentication process, this callback is used for
+- * all of the writes.
+- */
++ * all of the writes.
++ */
+ static void
+ globus_l_xio_gssapi_ftp_client_preauth_client_write_cb(
+ globus_xio_operation_t op,
+@@ -1709,8 +1709,8 @@ globus_l_xio_gssapi_ftp_accept_cb(
+ }
+
+ /*
+- * callback for the pass open. If the state is not completely open
+- * post a read to move to the next point in the authentication
++ * callback for the pass open. If the state is not completely open
++ * post a read to move to the next point in the authentication
+ * process. In the normal case this will be AUTH, however the user
+ * may circumvent these steps.
+ */
+@@ -1794,7 +1794,7 @@ globus_l_xio_gssapi_ftp_server_open_cb(
+ /************************************************************************
+ * client open functions
+ * ---------------------
+- *
++ *
+ * This section has functions that open a handle for a client
+ ***********************************************************************/
+
+@@ -1829,7 +1829,7 @@ globus_l_xio_gssapi_ftp_client_adat(
+
+ if(handle->subject == NULL)
+ {
+- xio_driver_handle =
++ xio_driver_handle =
+ globus_xio_operation_get_driver_handle(handle->op);
+
+ result = globus_xio_driver_handle_cntl(
+@@ -1892,15 +1892,15 @@ globus_l_xio_gssapi_ftp_client_adat(
+ case GSSAPI_FTP_STATE_CLIENT_SENDING_ADAT:
+ /* base64 decode the reply */
+ length = globus_libc_strlen(buffer);
+-
++
+ radix_buf = globus_libc_malloc((length + 1) * 6 / 8 + 1);
+-
++
+ if(radix_buf == GLOBUS_NULL)
+ {
+ res = GlobusXIOGssapiFTPAllocError();
+ goto err;
+ }
+-
++
+ res = globus_l_xio_gssapi_ftp_radix_decode(
+ (const globus_byte_t *) buffer,
+ radix_buf,
+@@ -1962,8 +1962,8 @@ globus_l_xio_gssapi_ftp_client_adat(
+ memcpy(radix_buf, "ADAT ", 5);
+ length = send_tok.length;
+ res = globus_l_xio_gssapi_ftp_radix_encode(
+- send_tok.value,
+- send_tok.length,
++ send_tok.value,
++ send_tok.length,
+ &radix_buf[5],
+ &length);
+ if(res != GLOBUS_SUCCESS)
+@@ -1978,7 +1978,7 @@ globus_l_xio_gssapi_ftp_client_adat(
+ *out_buffer = (char *) radix_buf;
+ }
+
+- break;
++ break;
+
+ default:
+ res = GlobusXIOGssapiFTPGSIAuthFailure(maj_stat, min_stat);
+@@ -2054,7 +2054,7 @@ globus_l_xio_gssapi_ftp_preauth_client_read_cb(
+ {
+ GlobusXIOGssapiftpDebugChangeState(handle,
+ GSSAPI_FTP_STATE_CLIENT_SENDING_AUTH);
+- send_buffer =
++ send_buffer =
+ globus_libc_strdup(CLIENT_AUTH_GSSAPI_COMMAND);
+ handle->banner = handle->auth_read_iov.iov_base;
+ handle->banner_length = handle->auth_read_iov.iov_len;
+@@ -2222,7 +2222,7 @@ globus_l_xio_gssapi_ftp_accept(
+
+ GlobusXIOGssapiftpDebugEnter();
+
+- res = globus_xio_driver_pass_accept(accept_op,
++ res = globus_xio_driver_pass_accept(accept_op,
+ globus_l_xio_gssapi_ftp_accept_cb, NULL);
+
+ GlobusXIOGssapiftpDebugExit();
+@@ -2242,11 +2242,11 @@ globus_l_xio_gssapi_ftp_attr_init(
+
+ GlobusXIOGssapiftpDebugEnter();
+
+- attr = (globus_l_xio_gssapi_attr_t *)
++ attr = (globus_l_xio_gssapi_attr_t *)
+ globus_calloc(1, sizeof(globus_l_xio_gssapi_attr_t));
+ if(attr == NULL)
+ {
+- goto err;
++ goto err;
+ }
+ attr->subject = NULL;
+ attr->start_state = GSSAPI_FTP_STATE_NONE;
+@@ -2330,7 +2330,7 @@ globus_l_xio_gssapi_ftp_attr_copy(
+ res = globus_l_xio_gssapi_ftp_attr_init((void **) &dst_attr);
+ if(res != GLOBUS_SUCCESS)
+ {
+- goto err;
++ goto err;
+ }
+ memcpy(dst_attr, src_attr, sizeof(globus_l_xio_gssapi_attr_t));
+ if(src_attr->subject != NULL)
+@@ -2390,11 +2390,11 @@ globus_l_xio_gssapi_ftp_open(
+ attr = (globus_l_xio_gssapi_attr_t *) driver_attr;
+
+ globus_xio_driver_attr_cntl(
+- op, globus_l_gssapi_telnet_driver,
++ op, globus_l_gssapi_telnet_driver,
+ GLOBUS_XIO_TELNET_BUFFER, GLOBUS_TRUE);
+
+ /*
+- * create a new handle and initialize it
++ * create a new handle and initialize it
+ */
+ handle = globus_l_xio_gssapi_ftp_handle_create();
+ if(handle == NULL)
+@@ -2407,7 +2407,7 @@ globus_l_xio_gssapi_ftp_open(
+ {
+ handle->client = GLOBUS_FALSE;
+ globus_xio_driver_attr_cntl(
+- op, globus_l_gssapi_telnet_driver,
++ op, globus_l_gssapi_telnet_driver,
+ GLOBUS_XIO_TELNET_FORCE_SERVER, GLOBUS_TRUE);
+ }
+ else
+@@ -2482,7 +2482,7 @@ globus_l_xio_gssapi_ftp_close(
+ /************************************************************************
+ * write functions
+ * ---------------
+- *
++ *
+ * This section has function that handle writes
+ ***********************************************************************/
+
+@@ -2601,7 +2601,7 @@ globus_l_xio_gssapi_ftp_write(
+ if(handle->client)
+ {
+ res = globus_l_xio_gssapi_ftp_wrap(
+- handle, handle->write_buffer, length,
++ handle, handle->write_buffer, length,
+ &l_iov[0].iov_base,
+ &l_iov[0].iov_len,
+ handle->client);
+@@ -2676,7 +2676,7 @@ globus_l_xio_gssapi_ftp_write(
+ handle->write_iov = l_iov;
+ handle->write_iov_count = l_iov_ndx;
+ res = globus_xio_driver_pass_write(
+- op,
++ op,
+ l_iov,
+ l_iov_ndx,
+ length,
+@@ -2706,7 +2706,7 @@ error_free_vec:
+ /************************************************************************
+ * read functions
+ * --------------
+- *
++ *
+ * This section has function that handle writes
+ ***********************************************************************/
+
+@@ -2836,7 +2836,7 @@ globus_l_xio_gssapi_ftp_read(
+
+ /* should serialize */
+ /* completely de const'ipating here */
+- handle->read_iov = (globus_xio_iovec_t *) iovec;
++ handle->read_iov = (globus_xio_iovec_t *) iovec;
+ if(handle->client)
+ {
+ if(handle->banner != NULL)
+@@ -2872,7 +2872,7 @@ globus_l_xio_gssapi_ftp_read(
+ &handle->auth_read_iov,
+ 1,
+ 1,
+- globus_l_xio_gssapi_ftp_server_read_cb,
++ globus_l_xio_gssapi_ftp_server_read_cb,
+ handle);
+ if(res != GLOBUS_SUCCESS)
+ {
+@@ -2880,7 +2880,7 @@ globus_l_xio_gssapi_ftp_read(
+ }
+ handle->read_posted = GLOBUS_TRUE;
+ }
+- }
++ }
+ globus_mutex_unlock(&handle->mutex);
+
+ if(finished)
+@@ -2967,7 +2967,7 @@ error:
+ /************************************************************************
+ * load and activate
+ * -----------------
+- *
++ *
+ * This section has function that handle writes
+ ***********************************************************************/
+ static globus_result_t
+@@ -3050,13 +3050,13 @@ globus_l_xio_gssapi_ftp_activate(void)
+ rc = globus_module_activate(GLOBUS_XIO_MODULE);
+ rc = globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE);
+ globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
+-
++
+ res = globus_xio_driver_load("telnet", &globus_l_gssapi_telnet_driver);
+ if(res != GLOBUS_SUCCESS)
+ {
+ return GLOBUS_FAILURE;
+ }
+-
++
+ GlobusXIORegisterDriver(gssapi_ftp);
+ GlobusXIOGssapiftpDebugExit();
+ return rc;
+--
+2.54.0
+
diff --git a/0002-Fix-compiler-and-doxygen-warnings.patch b/0002-Fix-compiler-and-doxygen-warnings.patch
new file mode 100644
index 0000000..e2d810e
--- /dev/null
+++ b/0002-Fix-compiler-and-doxygen-warnings.patch
@@ -0,0 +1,104 @@
+From 4ee08d13e2963309e2063dc45dedd067337d3b76 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 20 May 2026 00:15:37 +0200
+Subject: [PATCH 2/2] Fix compiler and doxygen warnings
+
+---
+ .../server-lib/src/globus_gridftp_server_control.c | 11 +++++------
+ .../src/globus_gridftp_server_control_commands.c | 2 +-
+ gridftp/server-lib/src/globus_xio_gssapi_ftp.c | 3 ---
+ 3 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/gridftp/server-lib/src/globus_gridftp_server_control.c b/gridftp/server-lib/src/globus_gridftp_server_control.c
+index cae415c18..8e14baa3e 100644
+--- a/gridftp/server-lib/src/globus_gridftp_server_control.c
++++ b/gridftp/server-lib/src/globus_gridftp_server_control.c
+@@ -2021,7 +2021,7 @@ globus_i_gsc_concat_path(
+ }
+ else if(in_path[0] == '~')
+ {
+- if((tmp_ptr = strchr(in_path, '/')) != NULL)
++ if((tmp_ptr = (char *) strchr(in_path, '/')) != NULL)
+ {
+ tmp_path = globus_common_create_string("%s%s",
+ i_server->default_cwd,
+@@ -2199,7 +2199,7 @@ globus_l_gsc_cmd_site(
+ GlobusGridFTPServerDebugInternalEnter();
+
+ /* to upper in the actual initial buffer */
+- for(tmp_ptr = strstr(full_command, cmd_a[1]); tmp_ptr && *tmp_ptr && *tmp_ptr != ' '; tmp_ptr++)
++ for(tmp_ptr = (char *) strstr(full_command, cmd_a[1]); tmp_ptr && *tmp_ptr && *tmp_ptr != ' '; tmp_ptr++)
+ {
+ *tmp_ptr = toupper(*tmp_ptr);
+ }
+@@ -2245,7 +2245,6 @@ globus_l_gsc_command_callout(
+ globus_bool_t auth = GLOBUS_FALSE;
+ char ** cmd_array;
+ char * msg;
+- globus_result_t res;
+ globus_l_gsc_cmd_ent_t * cmd_ent;
+ globus_bool_t done = GLOBUS_FALSE;
+ globus_i_gsc_op_t * op;
+@@ -2285,7 +2284,7 @@ globus_l_gsc_command_callout(
+ GLOBUS_GRIDFTP_SERVER_CONTROL_LOG_ERROR);
+
+ globus_i_gsc_op_destroy(op);
+- res = globus_l_gsc_final_reply(server_handle, msg);
++ globus_l_gsc_final_reply(server_handle, msg);
+ done = GLOBUS_TRUE;
+ }
+ else
+@@ -2719,8 +2718,8 @@ globus_gridftp_server_control_destroy(
+ }
+ if(server_handle->del_cred != GSS_C_NO_CREDENTIAL)
+ {
+- OM_uint32 min, maj;
+- maj = gss_release_cred(&min, &server_handle->del_cred);
++ OM_uint32 min;
++ gss_release_cred(&min, &server_handle->del_cred);
+ }
+ while(!globus_list_empty(server_handle->all_cmd_list))
+ {
+diff --git a/gridftp/server-lib/src/globus_gridftp_server_control_commands.c b/gridftp/server-lib/src/globus_gridftp_server_control_commands.c
+index 04735d4ec..4cbbc5919 100644
+--- a/gridftp/server-lib/src/globus_gridftp_server_control_commands.c
++++ b/gridftp/server-lib/src/globus_gridftp_server_control_commands.c
+@@ -425,7 +425,7 @@ globus_l_gsc_cmd_mode(
+ ch = (char)toupper((int)cmd_a[1][0]);
+ if(strchr(op->server_handle->modes, ch) == NULL)
+ {
+- tmp_ptr = strstr(full_command, "\r\n");
++ tmp_ptr = (char *) strstr(full_command, "\r\n");
+ if(tmp_ptr != NULL)
+ {
+ *tmp_ptr = '\0';
+diff --git a/gridftp/server-lib/src/globus_xio_gssapi_ftp.c b/gridftp/server-lib/src/globus_xio_gssapi_ftp.c
+index b55d4a3e0..c9717254e 100644
+--- a/gridftp/server-lib/src/globus_xio_gssapi_ftp.c
++++ b/gridftp/server-lib/src/globus_xio_gssapi_ftp.c
+@@ -2557,7 +2557,6 @@ globus_l_xio_gssapi_ftp_write(
+ globus_byte_t * out_buf;
+ globus_byte_t * next_ptr;
+ globus_byte_t * tmp_ptr;
+- int tmp_i;
+ int tmp_i2;
+ globus_xio_iovec_t * l_iov;
+ int l_iov_ndx = 1;
+@@ -2635,14 +2634,12 @@ globus_l_xio_gssapi_ftp_write(
+
+ l_iov_ndx = 0;
+ out_buf = NULL;
+- tmp_i = 3;
+ tmp_ptr = handle->write_buffer;
+ while(tmp_ptr - handle->write_buffer < length)
+ {
+ if(!first)
+ {
+ out_buf[3] = '-';
+- tmp_i += tmp_i2;
+ }
+ next_ptr = (globus_byte_t *)
+ strstr((const char *) tmp_ptr, "\r\n");
+--
+2.54.0
+
diff --git a/globus-gridftp-server-control.spec b/globus-gridftp-server-control.spec
index c6253e3..8716f14 100644
--- a/globus-gridftp-server-control.spec
+++ b/globus-gridftp-server-control.spec
@@ -1,13 +1,15 @@
Name: globus-gridftp-server-control
%global _name %(tr - _ <<< %{name})
Version: 9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Grid Community Toolkit - Globus GridFTP Server Library
License: Apache-2.0
URL: https://github.com/gridcf/gct/
Source: https://repo.gridcf.org/gct6/sources/%{_name}-%{version}.tar.gz
Source8: README
+Patch0: 0001-Untabify-and-remove-trailing-white-space.patch
+Patch1: 0002-Fix-compiler-and-doxygen-warnings.patch
BuildRequires: make
BuildRequires: gcc
@@ -49,6 +51,8 @@ Globus GridFTP Server Library Development Files
%prep
%setup -q -n %{_name}-%{version}
+%patch -P0 -p4
+%patch -P1 -p4
%build
# Reduce overlinking
@@ -90,6 +94,9 @@ rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Jun 14 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 9.5-3
+- Fix compiler warnings
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
reply other threads:[~2026-06-14 8:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178142686615.1.5416045076089655443.rpms-globus-gridftp-server-control-e638fc67bff1@fedoraproject.org \
--to=mattias.ellert@physics.uu.se \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox