network_cmds-356.8.tar.gz

[apple/network_cmds.git] / alias / alias_ftp.c

diff --git a/alias/alias_ftp.c b/alias/alias_ftp.c
index 7985a95fd3f281818742b857f61489733b96c129..d59fbf322c90b57f35ba6fa359d604d7ba2acf13 100644 (file)
--- a/alias/alias_ftp.c
+++ b/alias/alias_ftp.c
@@ -1,24 +1,31 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
  */

+

 /*-
  * Copyright (c) 2001 Charles Mott <cmott@scientech.com>
  * All rights reserved.
 /*-
  * Copyright (c) 2001 Charles Mott <cmott@scientech.com>
  * All rights reserved.


@@ -530,28 +537,28 @@ NewFtpMessage(struct ip *pip,
            case FTP_PORT_COMMAND:
            case FTP_227_REPLY:
                /* Decompose alias port into pair format. */
            case FTP_PORT_COMMAND:
            case FTP_227_REPLY:
                /* Decompose alias port into pair format. */

-               ptr = (char *) &alias_port;
+               ptr = (u_char *) &alias_port;

                p1 = *ptr++; p2=*ptr;
 
                if (ftp_message_type == FTP_PORT_COMMAND) {
                    /* Generate PORT command string. */
                p1 = *ptr++; p2=*ptr;
 
                if (ftp_message_type == FTP_PORT_COMMAND) {
                    /* Generate PORT command string. */

-                   sprintf(stemp, "PORT %d,%d,%d,%d,%d,%d\r\n",
+                   snprintf(stemp, sizeof(stemp), "PORT %d,%d,%d,%d,%d,%d\r\n",

                            a1,a2,a3,a4,p1,p2);
                } else {
                    /* Generate 227 reply string. */
                            a1,a2,a3,a4,p1,p2);
                } else {
                    /* Generate 227 reply string. */

-                   sprintf(stemp,
+                   snprintf(stemp, sizeof(stemp),

                            "227 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n",
                            a1,a2,a3,a4,p1,p2);
                }
                break;
            case FTP_EPRT_COMMAND:
                /* Generate EPRT command string. */
                            "227 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n",
                            a1,a2,a3,a4,p1,p2);
                }
                break;
            case FTP_EPRT_COMMAND:
                /* Generate EPRT command string. */

-               sprintf(stemp, "EPRT |1|%d.%d.%d.%d|%d|\r\n",
+               snprintf(stemp, sizeof(stemp), "EPRT |1|%d.%d.%d.%d|%d|\r\n",

                        a1,a2,a3,a4,ntohs(alias_port));
                break;
            case FTP_229_REPLY:
                /* Generate 229 reply string. */
                        a1,a2,a3,a4,ntohs(alias_port));
                break;
            case FTP_229_REPLY:
                /* Generate 229 reply string. */

-               sprintf(stemp, "229 Entering Extended Passive Mode (|||%d|)\r\n",
+               snprintf(stemp, sizeof(stemp), "229 Entering Extended Passive Mode (|||%d|)\r\n",

                        ntohs(alias_port));
                break;
            }
                        ntohs(alias_port));
                break;
            }