| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Mon, 21 Nov 2011 07:20:21 -0800 | |
| changeset 591 | d3cce09912d0 |
| parent 581 | ac0dbbad1d49 |
| child 987 | 810b92005f34 |
| child 3083 | 6826bd655a25 |
| permissions | -rw-r--r-- |
|
581
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
*** coreutils-8.5/lib/mountlist.c.orig Wed Nov 9 06:19:54 2011 |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
--- coreutils-8.5/lib/mountlist.c Wed Nov 9 07:25:30 2011 |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
*************** |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
*** 157,166 **** |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
#endif |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
|
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
#ifndef ME_REMOTE |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
! /* A file system is `remote' if its Fs_name contains a `:' |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
! or if (it is of type (smbfs or cifs) and its Fs_name starts with `//'). */ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
# define ME_REMOTE(Fs_name, Fs_type) \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
! (strchr (Fs_name, ':') != NULL \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
|| ((Fs_name)[0] == '/' \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
&& (Fs_name)[1] == '/' \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
&& (strcmp (Fs_type, "smbfs") == 0 \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
--- 157,167 ---- |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
#endif |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
|
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
#ifndef ME_REMOTE |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
! /* A file system is `remote' if its Fs_name contains a `:' (and isn't of |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
! type pcfs), or if (it is of type (smbfs or cifs) and its Fs_name starts |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
! with `//'). */ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
# define ME_REMOTE(Fs_name, Fs_type) \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
! ((strchr (Fs_name, ':') != NULL && strcmp (Fs_type, "pcfs") != 0) \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
|| ((Fs_name)[0] == '/' \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
&& (Fs_name)[1] == '/' \ |
|
ac0dbbad1d49
6890527 /usr/gnu/bin/df -l doesn't think that a locally-connected USB stick is local
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
&& (strcmp (Fs_type, "smbfs") == 0 \ |