Rework C source files to avoid ^(

[gnu-emacs] / src / w32notify.c

diff --git a/src/w32notify.c b/src/w32notify.c
index e822d9502632222411dfb3b79dd03e9070571e6e..586c2062f622a42776aad2c5d75a3656341996d1 100644 (file)
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -1,12 +1,12 @@
 /* Filesystem notifications support for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -144,8 +144,9 @@ send_notifications (BYTE *info, DWORD info_size, void *desc,
       if (!notification_buffer_in_use)
        {
          if (info_size)
-           memcpy (file_notifications, info, info_size);
-         notifications_size = info_size;
+           memcpy (file_notifications, info,
+                   min (info_size, sizeof (file_notifications)));
+         notifications_size = min (info_size, sizeof (file_notifications));
          notifications_desc = desc;
          /* If PostMessage fails, the message queue is full.  If that
             happens, the last thing they will worry about is file
@@ -525,7 +526,7 @@ generate notifications correctly, though.  */)
 
   /* The underlying features are available only since XP.  */
   if (os_subtype == OS_9X
-      || (w32_major_version == 5 && w32_major_version < 1))
+      || (w32_major_version == 5 && w32_minor_version < 1))
     {
       errno = ENOSYS;
       report_file_notify_error ("Watching filesystem events is not supported",