Deleted Added
full compact
pass2.c (208330) pass2.c (221110)
1/*
2 * Copyright (c) 1980, 1986, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 19 unchanged lines hidden (view full) ---

28 */
29
30#if 0
31#ifndef lint
32static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95";
33#endif /* not lint */
34#endif
35#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1980, 1986, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 19 unchanged lines hidden (view full) ---

28 */
29
30#if 0
31#ifndef lint
32static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95";
33#endif /* not lint */
34#endif
35#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: head/sbin/fsck_ffs/pass2.c 208330 2010-05-20 06:05:40Z mckusick $");
36__FBSDID("$FreeBSD: head/sbin/fsck_ffs/pass2.c 221110 2011-04-27 02:55:03Z des $");
37
38#include <sys/param.h>
39#include <sys/sysctl.h>
40
41#include <ufs/ufs/dinode.h>
42#include <ufs/ufs/dir.h>
43#include <ufs/ffs/fs.h>
44

--- 474 unchanged lines hidden (view full) ---

519
520static int
521fix_extraneous(struct inoinfo *inp, struct inodesc *idesc)
522{
523 char *cp;
524 struct inodesc dotdesc;
525 char oldname[MAXPATHLEN + 1];
526 char newname[MAXPATHLEN + 1];
37
38#include <sys/param.h>
39#include <sys/sysctl.h>
40
41#include <ufs/ufs/dinode.h>
42#include <ufs/ufs/dir.h>
43#include <ufs/ffs/fs.h>
44

--- 474 unchanged lines hidden (view full) ---

519
520static int
521fix_extraneous(struct inoinfo *inp, struct inodesc *idesc)
522{
523 char *cp;
524 struct inodesc dotdesc;
525 char oldname[MAXPATHLEN + 1];
526 char newname[MAXPATHLEN + 1];
527
527
528 /*
529 * If we have not yet found "..", look it up now so we know
530 * which inode the directory itself believes is its parent.
531 */
532 if (inp->i_dotdot == 0) {
533 memset(&dotdesc, 0, sizeof(struct inodesc));
534 dotdesc.id_type = DATA;
535 dotdesc.id_number = idesc->id_dirp->d_ino;

--- 131 unchanged lines hidden ---
528 /*
529 * If we have not yet found "..", look it up now so we know
530 * which inode the directory itself believes is its parent.
531 */
532 if (inp->i_dotdot == 0) {
533 memset(&dotdesc, 0, sizeof(struct inodesc));
534 dotdesc.id_type = DATA;
535 dotdesc.id_number = idesc->id_dirp->d_ino;

--- 131 unchanged lines hidden ---