API tools faq
paste
Advertisement
TeLLie

Untitled

TeLLie
Dec 21st, 2016
131
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.83 KB | None | 0 0
raw download clone embed print report
  1. diff -ur ncftp-3.2.1-o/configure ncftp-3.2.1/configure
  2. --- ncftp-3.2.1-o/configure 2007-08-01 15:09:16.000000000 +0930
  3. +++ ncftp-3.2.1/configure 2007-09-11 11:01:52.000000000 +0930
  4. @@ -9922,7 +9922,7 @@
  5.  
  6. EOF
  7. cat >> $CONFIG_STATUS <<\EOF
  8. -/bin/rm -f ./ncftp/readln.o
  9. +rm -f ./ncftp/readln.o
  10.  
  11. exit 0
  12. EOF
  13. Only in ncftp-3.2.1: configure.log
  14. Only in ncftp-3.2.1: configure~
  15. Only in ncftp-3.2.1/libncftp: Makefile
  16. Only in ncftp-3.2.1/libncftp: c_chdir.o
  17. Only in ncftp-3.2.1/libncftp: c_chdir3.o
  18. Only in ncftp-3.2.1/libncftp: c_chdirlist.o
  19. Only in ncftp-3.2.1/libncftp: c_chmod.o
  20. Only in ncftp-3.2.1/libncftp: c_delete.o
  21. Only in ncftp-3.2.1/libncftp: c_exists.o
  22. Only in ncftp-3.2.1/libncftp: c_filetype.o
  23. Only in ncftp-3.2.1/libncftp: c_getcwd.o
  24. Only in ncftp-3.2.1/libncftp: c_mkdir.o
  25. Only in ncftp-3.2.1/libncftp: c_mlist1.o
  26. Only in ncftp-3.2.1/libncftp: c_modtime.o
  27. Only in ncftp-3.2.1/libncftp: c_opennologin.o
  28. Only in ncftp-3.2.1/libncftp: c_rename.o
  29. Only in ncftp-3.2.1/libncftp: c_rhelp.o
  30. Only in ncftp-3.2.1/libncftp: c_rmdir.o
  31. Only in ncftp-3.2.1/libncftp: c_rmdirr.o
  32. Only in ncftp-3.2.1/libncftp: c_size.o
  33. Only in ncftp-3.2.1/libncftp: c_sizemdtm.o
  34. Only in ncftp-3.2.1/libncftp: c_symlink.o
  35. Only in ncftp-3.2.1/libncftp: c_type.o
  36. Only in ncftp-3.2.1/libncftp: c_umask.o
  37. Only in ncftp-3.2.1/libncftp: c_utime.o
  38. Only in ncftp-3.2.1/libncftp: errno.o
  39. Only in ncftp-3.2.1/libncftp: ftp.o
  40. Only in ncftp-3.2.1/libncftp: ftw.o
  41. Only in ncftp-3.2.1/libncftp: io_get.o
  42. Only in ncftp-3.2.1/libncftp: io_getfiles.o
  43. Only in ncftp-3.2.1/libncftp: io_getmem.o
  44. Only in ncftp-3.2.1/libncftp: io_getonefile.o
  45. Only in ncftp-3.2.1/libncftp: io_gettar.o
  46. Only in ncftp-3.2.1/libncftp: io_list.o
  47. Only in ncftp-3.2.1/libncftp: io_listmem.o
  48. Only in ncftp-3.2.1/libncftp: io_put.o
  49. Only in ncftp-3.2.1/libncftp: io_putfiles.o
  50. Only in ncftp-3.2.1/libncftp: io_putmem.o
  51. Only in ncftp-3.2.1/libncftp: io_putonefile.o
  52. Only in ncftp-3.2.1/libncftp: io_util.o
  53. Only in ncftp-3.2.1/libncftp: lglob.o
  54. Only in ncftp-3.2.1/libncftp: lglobr.o
  55. Only in ncftp-3.2.1/libncftp: libncftp.a
  56. Only in ncftp-3.2.1/libncftp: linelist.o
  57. diff -ur ncftp-3.2.1-o/libncftp/ncftp.h ncftp-3.2.1/libncftp/ncftp.h
  58. --- ncftp-3.2.1-o/libncftp/ncftp.h 2007-08-01 10:48:34.000000000 +0930
  59. +++ ncftp-3.2.1/libncftp/ncftp.h 2007-09-11 11:01:52.000000000 +0930
  60. @@ -204,9 +204,32 @@
  61.  
  62. #include "ncftp_errno.h"
  63.  
  64. +#ifdef __INNOTEK_LIBC__
  65. +#include <os2.h>
  66. +# define longest_int LONGLONG
  67. +# define longest_int LONGLONG
  68. +# define longest_uint ULONGLONG
  69. +# ifndef HAVE_LONG_LONG
  70. +# define HAVE_LONG_LONG 1
  71. +# endif
  72. +# ifndef SCANF_LONG_LONG
  73. +# define SCANF_LONG_LONG "%Ld"
  74. +# endif
  75. +# ifndef PRINTF_LONG_LONG
  76. +# define PRINTF_LONG_LONG "%lld"
  77. +# endif
  78. +//# ifndef PRINTF_LONG_LONG_I64D
  79. +//# define PRINTF_LONG_LONG_I64D 1
  80. +//# endif
  81. +//# ifndef SCANF_LONG_LONG_I64D
  82. +//# define SCANF_LONG_LONG_I64D 1
  83. +//# endif
  84. +
  85. +#endif
  86. +
  87. #ifndef longest_int
  88. -#define longest_int long long
  89. -#define longest_uint unsigned long long
  90. +#define longest_int long
  91. +#define longest_uint unsigned long
  92. #endif
  93.  
  94. #ifndef forever
  95. @@ -713,6 +736,18 @@
  96. # define IsLocalPathDelim(c) ((c == LOCAL_PATH_DELIM) || (c == LOCAL_PATH_ALTDELIM))
  97. # define UNC_PATH_PREFIX "//"
  98. # define IsUNCPrefixed(s) (IsLocalPathDelim(s[0]) && IsLocalPathDelim(s[1]))
  99. +#elif defined(__EMX__)
  100. +# define LOCAL_PATH_DELIM '/'
  101. +# define LOCAL_PATH_DELIM_STR "/"
  102. +# define LOCAL_PATH_ALTDELIM '\\'
  103. +# define IsLocalPathDelim(c) ((c == LOCAL_PATH_DELIM) || (c == LOCAL_PATH_ALTDELIM))
  104. +# define UNC_PATH_PREFIX "//"
  105. +# define IsUNCPrefixed(s) (IsLocalPathDelim(s[0]) && IsLocalPathDelim(s[1]))
  106. +# define StrFindLocalPathDelim(a) strchr(a, LOCAL_PATH_DELIM)
  107. +# define StrRFindLocalPathDelim(a) strrchr(a, LOCAL_PATH_DELIM)
  108. +# define StrRemoveTrailingLocalPathDelim StrRemoveTrailingSlashes
  109. +# define TVFSPathToLocalPath(s)
  110. +# define LocalPathToTVFSPath(s)
  111. #else
  112. # define LOCAL_PATH_DELIM '/'
  113. # define LOCAL_PATH_DELIM_STR "/"
  114. Only in ncftp-3.2.1/libncftp: ncftp.h.rej
  115. Only in ncftp-3.2.1/libncftp: ncftp.h~
  116. Only in ncftp-3.2.1/libncftp: open.o
  117. Only in ncftp-3.2.1/libncftp: rcmd.o
  118. Only in ncftp-3.2.1/libncftp: rftw.o
  119. Only in ncftp-3.2.1/libncftp: rglob.o
  120. Only in ncftp-3.2.1/libncftp: rglobr.o
  121. Only in ncftp-3.2.1/libncftp: u_close.o
  122. Only in ncftp-3.2.1/libncftp: u_decodehost.o
  123. Only in ncftp-3.2.1/libncftp: u_decodeurl.o
  124. Only in ncftp-3.2.1/libncftp: u_error.o
  125. Only in ncftp-3.2.1/libncftp: u_feat.o
  126. Only in ncftp-3.2.1/libncftp: u_fileextn.o
  127. Only in ncftp-3.2.1/libncftp: u_getcwd.o
  128. Only in ncftp-3.2.1/libncftp: u_gethome.o
  129. Only in ncftp-3.2.1/libncftp: u_getopt.o
  130. Only in ncftp-3.2.1/libncftp: u_getpass.o
  131. Only in ncftp-3.2.1/libncftp: u_getpw.o
  132. Only in ncftp-3.2.1/libncftp: u_getusr.o
  133. Only in ncftp-3.2.1/libncftp: u_getutc.o
  134. Only in ncftp-3.2.1/libncftp: u_gmtime.o
  135. Only in ncftp-3.2.1/libncftp: u_localtime.o
  136. Only in ncftp-3.2.1/libncftp: u_misc.o
  137. Only in ncftp-3.2.1/libncftp: u_miscdebug.o
  138. diff -ur ncftp-3.2.1-o/libncftp/u_mkdirs.c ncftp-3.2.1/libncftp/u_mkdirs.c
  139. --- ncftp-3.2.1-o/libncftp/u_mkdirs.c 2005-01-02 08:01:18.000000000 +1030
  140. +++ ncftp-3.2.1/libncftp/u_mkdirs.c 2007-09-11 11:01:52.000000000 +0930
  141. @@ -30,7 +30,7 @@
  142.  
  143. errno = 0; /* We can return 0 but set errno to EEXIST */
  144.  
  145. -#if defined(WIN32) || defined(_WINDOWS) || defined(__CYGWIN__)
  146. +#if defined(WIN32) || defined(_WINDOWS) || defined(__CYGWIN__)
  147. if ((isalpha(newdir[0])) && (newdir[1] == ':')) {
  148. if (! IsLocalPathDelim(newdir[2])) {
  149. /* Special case "c:blah", and errout.
  150. Only in ncftp-3.2.1/libncftp: u_mkdirs.o
  151. Only in ncftp-3.2.1/libncftp: u_pathcat.o
  152. Only in ncftp-3.2.1/libncftp: u_printf.o
  153. Only in ncftp-3.2.1/libncftp: u_rebuildci.o
  154. Only in ncftp-3.2.1/libncftp: u_scram.o
  155. Only in ncftp-3.2.1/libncftp: u_shutdownci.o
  156. Only in ncftp-3.2.1/libncftp: u_signal.o
  157. Only in ncftp-3.2.1/libncftp: u_slash.o
  158. Only in ncftp-3.2.1/libncftp: u_unmdtm.o
  159. Only in ncftp-3.2.1/libncftp: unls.o
  160. Only in ncftp-3.2.1/ncftp: Makefile
  161. Only in ncftp-3.2.1/ncftp: bookmark.o
  162. diff -ur ncftp-3.2.1-o/ncftp/cmdlist.c ncftp-3.2.1/ncftp/cmdlist.c
  163. --- ncftp-3.2.1-o/ncftp/cmdlist.c 2006-08-02 09:10:54.000000000 +0930
  164. +++ ncftp-3.2.1/ncftp/cmdlist.c 2008-07-13 19:01:00.000000000 +0930
  165. @@ -232,7 +232,7 @@
  166. kCompleteLocalDir,
  167. kNoMin, 1,
  168. },
  169. -#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
  170. +#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
  171. #else
  172. { "lchmod",
  173. LocalChmodCmd,
  174. Only in ncftp-3.2.1/ncftp: cmdlist.o
  175. diff -ur ncftp-3.2.1-o/ncftp/cmds.c ncftp-3.2.1/ncftp/cmds.c
  176. --- ncftp-3.2.1-o/ncftp/cmds.c 2007-07-27 12:41:04.000000000 +0930
  177. +++ ncftp-3.2.1/ncftp/cmds.c 2008-07-13 19:01:14.000000000 +0930
  178. @@ -130,7 +130,9 @@
  179.  
  180. (void) fflush(stdout);
  181. pprog = gPager;
  182. +
  183. fp = popen((pprog[0] == '\0') ? "more" : pprog, "w");
  184. +
  185. if (fp == NULL)
  186. return (stdout);
  187. return (fp);
  188. @@ -1987,7 +1989,12 @@
  189. (void) fflush(stdin);
  190. outfp = OpenPager();
  191.  
  192. - (void) STRNCPY(incmd, "/bin/ls");
  193. +#ifndef __OS2__
  194. + (void) STRNCPY(incmd, "bin/ls");
  195. +#else
  196. + (void) STRNCPY(incmd, getenv("UNIXROOT"));
  197. + (void) STRNCAT(incmd, "/bin/ls.exe");
  198. +#endif
  199. for (i=1, dashopts=0; i<argc; i++) {
  200. (void) STRNCAT(incmd, " ");
  201. if (argv[i][0] == '-')
  202. @@ -1996,7 +2003,12 @@
  203. }
  204.  
  205. if (dashopts == 0) {
  206. +#ifndef __OS2__
  207. (void) STRNCPY(incmd, "/bin/ls -CF");
  208. +#else
  209. + (void) STRNCPY(incmd, getenv("UNIXROOT"));
  210. + (void) STRNCAT(incmd, "/bin/ls.exe -CF");
  211. +#endif
  212. for (i=1; i<argc; i++) {
  213. (void) STRNCAT(incmd, " ");
  214. (void) STRNCAT(incmd, argv[i]);
  215. @@ -2004,6 +2016,7 @@
  216. }
  217.  
  218. infp = popen(incmd, "r");
  219. +
  220. if (infp == NULL) {
  221. ClosePager(outfp);
  222. return;
  223. @@ -2058,7 +2071,13 @@
  224. char cmd[256];
  225. int i;
  226.  
  227. +#ifndef __OS2__
  228. (void) STRNCPY(cmd, syscmd);
  229. +#else
  230. + (void) STRNCPY(cmd, getenv("UNIXROOT"));
  231. + (void) STRNCAT(cmd, syscmd);
  232. + (void) STRNCAT(cmd, ".exe");
  233. +#endif
  234. for (i = 1; i < argc; i++) {
  235. if (aip->noglobargv[i] != 0) {
  236. (void) STRNCAT(cmd, " '");
  237. @@ -2084,7 +2103,7 @@
  238.  
  239.  
  240.  
  241. -#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
  242. +#if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
  243. #else
  244. void
  245. LocalChmodCmd(const int argc, char **const argv, const CommandPtr cmdp, const ArgvInfoPtr aip)
  246. @@ -3519,6 +3538,9 @@
  247. void
  248. ShellCmd(const int argc, char **const argv, const CommandPtr cmdp, const ArgvInfoPtr aip)
  249. {
  250. +#ifdef __INNOTEK_LIBC__
  251. +printf("Entered ShellCmd\n");
  252. +#endif
  253. #if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__)
  254. #else
  255. const char *cp;
  256. Only in ncftp-3.2.1/ncftp: cmds.c~
  257. Only in ncftp-3.2.1/ncftp: cmds.o
  258. diff -ur ncftp-3.2.1-o/ncftp/gl_getline.c ncftp-3.2.1/ncftp/gl_getline.c
  259. --- ncftp-3.2.1-o/ncftp/gl_getline.c 2006-06-05 09:38:46.000000000 +0930
  260. +++ ncftp-3.2.1/ncftp/gl_getline.c 2007-09-11 11:01:52.000000000 +0930
  261. @@ -366,7 +366,37 @@
  262. }
  263. return c;
  264. }
  265. -#endif /* defined(MSDOS) || defined(__windows__) */
  266. +#endif /* defined(MSDOS) || defined(__windows__) */
  267. +
  268. +#if __IBMC__ || __EMX__
  269. +int pc_keymap(c)
  270. +int c;
  271. +{
  272. + switch (c) {
  273. + case 72:
  274. + case 73: c = 16; /* up -> ^P */
  275. + break;
  276. + case 80:
  277. + case 81: c = 14; /* down -> ^N */
  278. + break;
  279. + case 75: c = 2; /* left -> ^B */
  280. + break;
  281. + case 77: c = 6; /* right -> ^F */
  282. + break;
  283. + case 83: c = 4; /* delete -> ^D */
  284. + break;
  285. + case 71: c = 1; /* home -> ^A */
  286. + break;
  287. + case 79: c = 5; /* end -> ^E */
  288. + break;
  289. + case 82: c =15; /* insert -> ^O */
  290. + break;
  291. + default: c = 0; /* make it garbage */
  292. + }
  293. + return c;
  294. +}
  295. +#endif /* __IBMC__ || __EMX__ */
  296. +
  297.  
  298. static int
  299. gl_getc(void)
  300. @@ -377,7 +407,7 @@
  301. unsigned char ch;
  302. #endif
  303.  
  304. -#ifdef __unix__
  305. +#if (defined(__unix__)&&!defined(__EMX__))
  306. ch = '\0';
  307. while ((c = (int) read(0, &ch, (read_size_t) 1)) == -1) {
  308. if (errno != EINTR)
  309. @@ -394,7 +424,7 @@
  310. c &= 0377;
  311. }
  312. #endif /* MSDOS */
  313. -#ifdef __windows__
  314. +#if (defined __windows__ )
  315. c = (int) _getch();
  316. if ((c == 0) || (c == 0xE0)) {
  317. /* Read key code */
  318. @@ -407,12 +437,20 @@
  319. c = '\n';
  320. }
  321. #endif
  322. +#ifdef __EMX__
  323. + c = _read_kbd(0, 1, 0);
  324. + if (c == 224 || c == 0) {
  325. + c = pc_keymap(_read_kbd(0, 1, 0));
  326. + } else {
  327. + c &= 0377;
  328. + }
  329. +#endif
  330. return c;
  331. }
  332.  
  333.  
  334.  
  335. -#ifdef __unix__
  336. +#if (defined __unix__ )
  337.  
  338. static int
  339. gl_getcx(int tlen)
  340. @@ -465,13 +503,12 @@
  341.  
  342.  
  343.  
  344. -#ifdef __windows__
  345. +#if (defined __windows__)
  346.  
  347. static int
  348. gl_getcx(int tlen)
  349. {
  350. int i, c;
  351. -
  352. c = (-2);
  353. tlen -= 2; /* Adjust for 200ms overhead */
  354. if (tlen < 1)
  355. @@ -654,7 +691,7 @@
  356.  
  357. fp = fopen(
  358. path,
  359. -#if defined(__windows__) || defined(MSDOS)
  360. +#if defined(__windows__) || defined(MSDOS)
  361. "rt"
  362. #else
  363. "r"
  364. @@ -907,7 +944,7 @@
  365. search_term(); /* terminate and handle char */
  366. }
  367. }
  368. - switch (c) {
  369. + switch (c) {
  370. case '\n': case '\r': /* newline */
  371. gl_newline();
  372. gl_cleanup();
  373. @@ -1021,7 +1058,7 @@
  374. gl_word(-1);
  375. } else if (c != (-1)) {
  376. /* enter vi command mode */
  377. -#if defined(__windows__) || defined(MSDOS)
  378. +#if defined(__windows__) || defined(MSDOS)
  379. if (gl_vi_preferred == 0) {
  380. /* On Windows, ESC acts like a line kill,
  381. * so don't use vi mode unless they prefer
  382. @@ -1599,7 +1636,7 @@
  383. int i, j;
  384.  
  385. fp = fopen(path,
  386. -#if defined(__windows__) || defined(MSDOS)
  387. +#if defined(__windows__) || defined(MSDOS)
  388. "wt"
  389. #else
  390. "w"
  391. @@ -1627,7 +1664,7 @@
  392. char line[256];
  393.  
  394. fp = fopen(path,
  395. -#if defined(__windows__) || defined(MSDOS)
  396. +#if defined(__windows__) || defined(MSDOS)
  397. "rt"
  398. #else
  399. "r"
  400. @@ -2629,3 +2666,4 @@
  401. } /* gl_local_filename_completion_proc */
  402.  
  403. #endif /* __windows__ */
  404. +
  405. Only in ncftp-3.2.1/ncftp: gl_getline.o
  406. Only in ncftp-3.2.1/ncftp: log.o
  407. Only in ncftp-3.2.1/ncftp: ls.o
  408. diff -ur ncftp-3.2.1-o/ncftp/main.c ncftp-3.2.1/ncftp/main.c
  409. --- ncftp-3.2.1-o/ncftp/main.c 2006-08-06 07:00:44.000000000 +0930
  410. +++ ncftp-3.2.1/ncftp/main.c 2007-09-11 11:01:52.000000000 +0930
  411. @@ -359,7 +359,7 @@
  412. static void
  413. Plug(void)
  414. {
  415. -#if defined(WIN32) || defined(_WINDOWS) || defined(__CYGWIN__)
  416. +#if defined(WIN32) || defined(_WINDOWS) || defined(__CYGWIN__) || defined(__EMX__)
  417. /* NcFTPd hasn't been ported to Windows. */
  418. #else
  419. if (gDoNotDisplayAds == 0) {
  420. Only in ncftp-3.2.1/ncftp: main.o
  421. Only in ncftp-3.2.1/ncftp: pref.o
  422. Only in ncftp-3.2.1/ncftp: preffw.o
  423. diff -ur ncftp-3.2.1-o/ncftp/progress.c ncftp-3.2.1/ncftp/progress.c
  424. --- ncftp-3.2.1-o/ncftp/progress.c 2005-01-02 07:53:48.000000000 +1030
  425. +++ ncftp-3.2.1/ncftp/progress.c 2007-09-11 11:01:52.000000000 +0930
  426. @@ -262,7 +262,7 @@
  427. stall = "-";
  428. else
  429. stall = "=";
  430. -
  431. +//this one
  432. (void) sprintf(line, "%-32s ETA: %3d:%02d %6.2f/%6.2f %.2s %6.2f %.2s/s %s ",
  433. localName,
  434. minLeft,
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!