F_GETFD can't get O_NONBLOCK flag, use F_GETFL

Riddance · Riddance · commit cc46d60e6fa4 · 2020-07-07T20:23:18.000+08:00
diff --git a/co_hook_sys_call.cpp b/co_hook_sys_call.cpp
@@ -672,9 +672,6 @@ int fcntl(int fildes, int cmd, ...)
 		case F_GETFD:
 		{
 			ret = g_sys_fcntl_func( fildes,cmd );
-      if (lp && !(lp->user_flag & O_NONBLOCK)) {
-          ret = ret & (~O_NONBLOCK);
-      }
 			break;
 		}
 		case F_SETFD:
@@ -686,6 +683,9 @@ int fcntl(int fildes, int cmd, ...)
 		case F_GETFL:
 		{
 			ret = g_sys_fcntl_func( fildes,cmd );
+			if (lp && !(lp->user_flag & O_NONBLOCK)) {
+				ret = ret & (~O_NONBLOCK);
+			}
 			break;
 		}
 		case F_SETFL:

Original file line number	Diff line number	Diff line change
`@@ -672,9 +672,6 @@ int fcntl(int fildes, int cmd, ...)`
`672`	`672`	`case F_GETFD:`
`673`	`673`	`{`
`674`	`674`	`ret = g_sys_fcntl_func( fildes,cmd );`
`675`		`- if (lp && !(lp->user_flag & O_NONBLOCK)) {`
`676`		`- ret = ret & (~O_NONBLOCK);`
`677`		`- }`
`678`	`675`	`break;`
`679`	`676`	`}`
`680`	`677`	`case F_SETFD:`
`@@ -686,6 +683,9 @@ int fcntl(int fildes, int cmd, ...)`
`686`	`683`	`case F_GETFL:`
`687`	`684`	`{`
`688`	`685`	`ret = g_sys_fcntl_func( fildes,cmd );`
	`686`	`+ if (lp && !(lp->user_flag & O_NONBLOCK)) {`
	`687`	`+ ret = ret & (~O_NONBLOCK);`
	`688`	`+ }`
`689`	`689`	`break;`
`690`	`690`	`}`
`691`	`691`	`case F_SETFL:`