OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
7942 Commits
49 Branches
0 Tags
34 MiB
Tree: 25a98bab8e
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '25a98bab8e'
${ noResults }
package-nopast/x11/libvncserver/legacy_sus.patch

74 lines
2.7 KiB
Raw Normal View History

libvncserver: changed to use nanosleep() instead of usleep()
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../libvncserver/legacy_sus.patch
  5. # Copyright (C) 2010 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  17. usleep() was deprecated by SUSv3 and newer LIBCs are starting to enforce that
  18. deprecation.
  20. --- ./libvncserver/tightvnc-filetransfer/filetransfermsg.c.orig 2010-09-20 13:54:07.000000000 -0400
  21. +++ ./libvncserver/tightvnc-filetransfer/filetransfermsg.c 2010-09-20 14:02:20.000000000 -0400
  22. @@ -28,7 +28,7 @@
  23. #include <stdlib.h>
  24. #include <fcntl.h>
  25. #include <dirent.h>
  26. -#include <utime.h>
  27. +#include <sys/time.h>
  28. #include <errno.h>
  29. #include <unistd.h>
  30. #include <sys/stat.h>
  31. @@ -530,10 +530,11 @@
  32. {
  33. /* Here we are settimg the modification and access time of the file */
  34. /* Windows code stes mod/access/creation time of the file */
  35. - struct utimbuf utb;
  36. + struct timeval times[2];
  38. - utb.actime = utb.modtime = rtcp->rcft.rcfu.mTime;
  39. - if(utime(rtcp->rcft.rcfu.fName, &utb) == -1) {
  40. + times[0] = times[1] = (struct timeval) { .tv_sec = rtcp->rcft.rcfu.mTime, .tv_usec = 0 };
  41. +
  42. + if(utimes(rtcp->rcft.rcfu.fName, times) == -1) {
  43. rfbLog("File [%s]: Method [%s]: Setting the modification/access"
  44. " time for the file <%s> failed\n", __FILE__,
  45. __FUNCTION__, rtcp->rcft.rcfu.fName);
  46. --- ./libvncclient/sockets.c.orig 2010-09-20 14:10:30.000000000 -0400
  47. +++ ./libvncclient/sockets.c 2010-09-20 14:13:55.000000000 -0400
  48. @@ -92,8 +92,10 @@
  49. diff.tv_usec+=1000000;
  50. }
  51. #ifndef __MINGW32__
  52. - sleep (diff.tv_sec);
  53. - usleep (diff.tv_usec);
  54. + {
  55. + struct timespec ts = { diff.tv_sec, diff.tv_usec * 1000 };
  56. + nanosleep(&ts, NULL);
  57. + }
  58. #else
  59. Sleep (diff.tv_sec * 1000 + diff.tv_usec/1000);
  60. #endif
  61. --- ./libvncserver/main.c.orig 2010-09-20 14:10:23.000000000 -0400
  62. +++ ./libvncserver/main.c 2010-09-20 14:38:30.000000000 -0400
  63. @@ -464,7 +464,10 @@
  65. /* OK, now, to save bandwidth, wait a little while for more
  66. updates to come along. */
  67. - usleep(cl->screen->deferUpdateTime * 1000);
  68. + {
  69. + struct timespec ts = {.tv_sec = cl->screen->deferUpdateTime, .tv_nsec = 0};
  70. + nanosleep(&ts, NULL);
  71. + }
  73. /* Now, get the region we're going to update, and remove
  74. it from cl->modifiedRegion _before_ we send the update.