hush: fix a bug in argv restoration after sourcing a file

[oweals/busybox.git] / networking / telnetd.ctrlSQ.patch

diff --git a/networking/telnetd.ctrlSQ.patch b/networking/telnetd.ctrlSQ.patch
index 885e10523024c4e17b20d15f3a88ebc6c51732ff..bc26d2279e8877707ff2f3af48d2c28113637df7 100644 (file)
--- a/networking/telnetd.ctrlSQ.patch
+++ b/networking/telnetd.ctrlSQ.patch
@@ -94,9 +94,9 @@ exceptional conditions.
  #endif
 +#ifdef TIOCPKT
 +      int control;
-+      static const char lflow_on[] =
++      static const char lflow_on[] ALIGN1 =
 +          {IAC, SB, TELOPT_LFLOW, LFLOW_ON, IAC, SE};
-+      static const char lflow_off[] =
++      static const char lflow_off[] ALIGN1 =
 +          {IAC, SB, TELOPT_LFLOW, LFLOW_OFF, IAC, SE};
 +# define RESERVED sizeof(lflow_on)
 +#else
@@ -104,7 +104,7 @@ exceptional conditions.
 +#endif
        /* Even if !STANDALONE, we accept (and ignore) -i, thus people
         * don't need to guess whether it's ok to pass -i to us */
-       opt = getopt32(argv, "f:l:Ki" USE_FEATURE_TELNETD_STANDALONE("p:b:F"),
+       opt = getopt32(argv, "f:l:Ki" IF_FEATURE_TELNETD_STANDALONE("p:b:F"),
 @@ -475,7 +495,7 @@
                                FD_SET(ts->sockfd_read, &rdfdset);
                        if (ts->size2 > 0)       /* can write to socket */