OK...Solaris 8 /usr/bin/diff doesn't have a --unified option. Why does that
not surprise me...
Here it is with GNU diff:
--- ./maildir/maildirquota.c 2003-03-07 16:46:53.016127000 -0600
+++ ./maildir/maildirquota.c.orig 2003-03-07 17:19:48.760947000 -0600
@@ -637,8 +637,7 @@
int n;
if ( *subdir != '.' || strcmp(subdir, ".") == 0 ||
- strcmp(subdir, "..") == 0 || strcmp(subdir, "." TRASH) == 0
||
- strcmp(subdir, "." DRAFTS) ==0)
+ strcmp(subdir, "..") == 0 || strcmp(subdir, "." TRASH) == 0)
return (0);
p=(char *)malloc(strlen(dir)+strlen(subdir)+2);
@@ -747,17 +746,13 @@
#else
if (strcmp(folder, "." TRASH) == 0 ||
- strcmp(folder, "." TRASH "/") == 0 ||
- strcmp(folder, "." DRAFTS) == 0 ||
- strcmp(folder, "." DRAFTS "/") == 0)
+ strcmp(folder, "." TRASH "/") == 0)
return (0);
for ( ; *folder; folder++)
if (*folder == '/' &&
(strcmp(folder+1, "." TRASH) == 0 ||
- strcmp(folder+1, "." TRASH "/") == 0 ||
- strcmp(folder+1, "." DRAFTS) == 0 ||
- strcmp(folder+1, "." DRAFTS "/") == 0))
+ strcmp(folder+1, "." TRASH "/") == 0))
return (0);
#endif
return (1);
-----Original Message-----
From: Jesse Guardiani [mailto:[EMAIL PROTECTED]
Sent: Friday, March 07, 2003 4:43 PM
To: [EMAIL PROTECTED]
Subject: Re: [sqwebmail] Excluding folders from quota counts
On Friday 07 March 2003 16:51, Duane Wylie wrote:
> Hi all,
>
> I'm trying to setup sqwebmail to exclude the ~user/Maildir/.Drafts folder
> from being counted toward user's quotas, but have not yet been successful.
> The changes I've made so far compile with no errors, but seem to have no
> impact whatsoever.
>
> I've included a diff below to show what I've done so far. The lines
> 640-641 are in
> "static int statsubdir()", and the rest is in "int
> maildirquota_countfolder()".
Hi Duane.
Please post any future diffs with -u or unified format. The diff below
is difficult to use.
Thanks.
>
> If anyone can point me in the right direction, I'd appreciate it.
> I'm on version 3.5.0, and at this point, the modifications I've made are:
>
> # pwd
> /usr/local/src/sqwebmail-3.5.0
> # diff ./maildir/maildirquota.c ./maildir/maildirquota.c.orig
> 640,641c640
> < strcmp(subdir, "..") == 0 || strcmp(subdir, "." TRASH) == 0
>
> < strcmp(subdir, "." DRAFTS) == 0)
> ---
>
> > strcmp(subdir, "..") == 0 || strcmp(subdir, "." TRASH) == 0)
>
> 750,752c749
> < strcmp(folder, "." TRASH "/") == 0 ||
> < strcmp(folder, "." DRAFTS) == 0 ||
> < strcmp(folder, "." DRAFTS "/") == 0)
> ---
>
> > strcmp(folder, "." TRASH "/") == 0)
>
> 758,760c755
> < strcmp(folder+1, "." TRASH "/") == 0 ||
> < strcmp(folder+1, "." DRAFTS) == 0 ||
> < strcmp(folder+1, "." DRAFTS "/") == 0))
> ---
>
> > strcmp(folder+1, "." TRASH "/") == 0))
>
> Thanks,
> Duane
--
Jesse Guardiani, Systems Administrator
WingNET Internet Services,
P.O. Box 2605 // Cleveland, TN 37320-2605
423-559-LINK (v) 423-559-5145 (f)
http://www.wingnet.net
We are actively looking for companies that do a lot of long
distance faxing and want to cut their long distance bill by
up to 50%. Contact [EMAIL PROTECTED] for more info.
