1 files changed, 23 insertions, 6 deletions
diff --git a/clang/test/Analysis/unix-api.c b/clang/test/Analysis/unix-api.c
index 86c702d7259..24b145d3d3d 100644
--- a/clang/test/Analysis/unix-api.c
+++ b/clang/test/Analysis/unix-api.c
@@ -9,6 +9,7 @@
 #endif
 
 int open(const char *, int, ...);
+int openat(int, const char *, int, ...);
 int close(int fildes);
 
 void open_1(const char *path) {
@@ -21,21 +22,37 @@ void open_1(const char *path) {
 void open_2(const char *path) {
   int fd;
   int mode = 0x0;
-  fd = open(path, O_RDONLY, mode, NULL); // expected-warning{{Call to 'open' with more than three arguments}}
+  fd = open(path, O_RDONLY, mode, NULL); // expected-warning{{Call to 'open' with more than 3 arguments}}
+  if (fd > -1)
+    close(fd);
+}
+
+void openat_2(int base_fd, const char *path) {
+  int fd;
+  int mode = 0x0;
+  fd = openat(base_fd, path, O_RDONLY, mode, NULL); // expected-warning{{Call to 'openat' with more than 4 arguments}}
   if (fd > -1)
     close(fd);
 }
 
 void open_3(const char *path) {
   int fd;
-  fd = open(path, O_RDONLY, NULL); // expected-warning{{Third argument to 'open' is not an integer}}
+  fd = open(path, O_RDONLY, NULL); // expected-warning{{The 3rd argument to 'open' is not an integer}}
   if (fd > -1)
     close(fd);
 }
 
+void openat_3(int base_fd, const char *path) {
+  int fd;
+  fd = openat(base_fd, path, O_RDONLY, NULL); // expected-warning{{The 4th argument to 'openat' is not an integer}}
+  if (fd > -1)
+    close(fd);
+}
+
+
 void open_4(const char *path) {
   int fd;
-  fd = open(path, O_RDONLY, ""); // expected-warning{{Third argument to 'open' is not an integer}}
+  fd = open(path, O_RDONLY, ""); // expected-warning{{The 3rd argument to 'open' is not an integer}}
   if (fd > -1)
     close(fd);
 }
@@ -45,7 +62,7 @@ void open_5(const char *path) {
   struct {
     int val;
   } st = {0};
-  fd = open(path, O_RDONLY, st); // expected-warning{{Third argument to 'open' is not an integer}}
+  fd = open(path, O_RDONLY, st); // expected-warning{{The 3rd argument to 'open' is not an integer}}
   if (fd > -1)
     close(fd);
 }
@@ -62,14 +79,14 @@ void open_6(const char *path) {
 
 void open_7(const char *path) {
   int fd;
-  fd = open(path, O_RDONLY, &open); // expected-warning{{Third argument to 'open' is not an integer}}
+  fd = open(path, O_RDONLY, &open); // expected-warning{{The 3rd argument to 'open' is not an integer}}
   if (fd > -1)
     close(fd);
 }
 
 void open_8(const char *path) {
   int fd;
-  fd = open(path, O_RDONLY, 0.0f); // expected-warning{{Third argument to 'open' is not an integer}}
+  fd = open(path, O_RDONLY, 0.0f); // expected-warning{{The 3rd argument to 'open' is not an integer}}
   if (fd > -1)
     close(fd);
 }