From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: feature/android b91e8ada70e 3/5: Fix auto-revert-mode on Android Date: Sat, 25 Feb 2023 11:27:11 +0100 Message-ID: <87k006vy4g.fsf@gmx.de> References: <167724502313.15669.16640007729364817665@vcs2.savannah.gnu.org> <20230224132344.40927C1391F@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13291"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Po Lu To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Feb 25 11:28:07 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pVrmh-0003GV-PA for ged-emacs-devel@m.gmane-mx.org; Sat, 25 Feb 2023 11:28:07 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVrlw-0002UM-C7; Sat, 25 Feb 2023 05:27:20 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVrlu-0002PL-4w for emacs-devel@gnu.org; Sat, 25 Feb 2023 05:27:18 -0500 Original-Received: from mout.gmx.net ([212.227.17.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVrls-0000MJ-G7 for emacs-devel@gnu.org; Sat, 25 Feb 2023 05:27:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1677320832; i=michael.albinus@gmx.de; bh=Sm6pk0stuohMklKvjZA7dhbEGndM4Cu8ChH9hGF5sUI=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=OnRk1ymtvX6YzE9HjO3viqKb5kUJPwAYALuZYm5+n5Y7wr33YmEHRw79+IQQl4qUo s1X60zxAwwAWMaGVQDnhIxZlKVGezJubZJXkeT41xVRsqsA1DIJQw7wJH/czt5E7Cd NkAQE+mSKjjjB+0BHUI+08Rm93OMFrZbIIs2XSh0V6ZP5JupHNKVtbGKGbkJzr4p3i UL2ybwtsUoX7QUVUyGEhOx+zDG2I8u9XKZmd7ixFqBcw0an/rr4lJMyPXNEsNhyZAz R3ywGrbfY25v4LNdQEjyxe+cs4zS7Qf0Bmln3U3oMTmTwzLeYmsmrvE3zWoylfrmsy u6cwBvCAFYXVA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.39.22]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mnpru-1ohff010W2-00pM4P; Sat, 25 Feb 2023 11:27:12 +0100 In-Reply-To: <20230224132344.40927C1391F@vcs2.savannah.gnu.org> (Po Lu via Mailing list for Emacs changes's message of "Fri, 24 Feb 2023 08:23:44 -0500 (EST)") X-Provags-ID: V03:K1:PgVQbWln4IUwj5f/YPAxgO0VIxOQtkWOpEwa/Zr/UDJVUlJ5jsy hgVve2KFBhquJBnWueOiFDraPozdczvThwfjpZxz/G1BSUnO/Evg8zphvgbvdgqtRCamSOF SbG4/BT8yBbWiXLkiFkZ0kIpwexkM1/yhce+jIU6gsC+dGoOrCkbsFkoIGVkO1V0LAMXF3t zy3DEKCI8Xxt2a4wZP+5w== UI-OutboundReport: notjunk:1;M01:P0:P6P3F+7xY+o=;yCBhXMo0wUNiOCl4AVBqz64nDyt 2EOcP8MzKfwkAXPLSmoVwJl3O7O+UFr9I3CYAMmUiax2vzCZ7JsZz66rQ4SlkI/dpcgZO759q fWpH4Q+ywvKFfSAFkzvoncfndIdMuvFIx8D2jO3s5t2N5MALoncDaujOMdK5+FhjkY71eNcoO DD4RqIu1hJuaA2FbK4B/G1It5YdTeA0FhaCfPnb8sWvTqQQ+gqqR9A/aRoelx3FdaWSsiJx2j /CjUeKW0bzNS+tXB7rizlMElUKBOHgMYwCCsVCnyDt7K4gFWKzsg8zhQYcPY92t6dtbRX4dc4 d3Rh60RvBQoR/agL0yNhwoQtSHoZ3fbB86lqw7pe0nsinWagYvRJBYFRWG8oD7Kie3O6PQyaz ioJUh1ud/pgLyMvouiSeblj+CfvGX8It/d1+AufIZ8zNBLC6DgZa6TC4WIgcTOvnRRNgvD2Z/ cdPLu3wF1aexsjB9B+GOPi6ekDp1SMX0J/p5O8AEx/Zw0BT9miaAwoyQhbHlWsPvwHeWfxUHw 90ZQtcJbxM00JWw5A79DnzX3whclCPsYGOA8nlgVdZx+eELWPFa2b18JPvPrBH7/cOiwksDPT 6hh98veBqFR3hErCMzcxM6lRwDUQh6zOn1D8rwB0m3R8ddZEvHs9oa3c/Zh1s5o+B9c96cmzB uAKLGrxm2fHaKVY3go1nLpk4uKBfrL5JzXw7y2ZDDamvet9No79GR8He0nKQDX9aO4fkIRC21 rbmPKx/AeU4zvBm1+FEBGlcvRsBGr6Vp04EQhu/7DYodFRbMQXLNeyTPjeMqc1EArNiaHgzw Received-SPF: pass client-ip=212.227.17.20; envelope-from=michael.albinus@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:303791 Archived-At: Po Lu via Mailing list for Emacs changes writes: Hi, > Fix auto-revert-mode on Android > > * src/inotify.c (Finotify_add_watch): Handle asset files. > --- > src/inotify.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/src/inotify.c b/src/inotify.c > index 7562ffb1701..b2a48884efa 100644 > --- a/src/inotify.c > +++ b/src/inotify.c > @@ -419,6 +419,7 @@ IN_ONESHOT */) > int wd =3D -1; > uint32_t imask =3D aspect_to_inotifymask (aspect); > uint32_t mask =3D imask | IN_MASK_ADD | IN_EXCL_UNLINK; > + char *name; > > CHECK_STRING (filename); > > @@ -432,7 +433,23 @@ IN_ONESHOT */) > } > > encoded_file_name =3D ENCODE_FILE (filename); > - wd =3D inotify_add_watch (inotifyfd, SSDATA (encoded_file_name), mask= ); > + name =3D SSDATA (encoded_file_name); > + > +#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY > + /* If FILENAME actually lies in a special directory, return now > + instead of letting inotify fail. These directories cannot > + receive file notifications as they are read only. */ > + > + if (strcmp (name, "/assets") > + || strcmp (name, "/assets/") > + || strcmp (name, "/content") > + || strcmp (name, "/content/") > + || strncmp (name, "/assets/", sizeof "/assets") > + || strncmp (name, "/content", sizeof "/content")) > + return Qnil; > +#endif > + > + wd =3D inotify_add_watch (inotifyfd, name, mask); > if (wd < 0) > report_file_notify_error ("Could not add watch for file", filename)= ; I have two problems with this patch. First, nil is not defined as return value of *-add-watch functions. If we want to allow this, we must extend the interface. Second, do we really want to have such a hard coded list in inotify.c? What about other directories on other systems, like "/proc"? Shouldn't we add rather a common interface for excluding directories from being watched, say file-notify-excluded-directories (a list of strings)? This could be modified on Lisp level, no need to do it in the notification backends. Best regards, Michael.